diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 17:36:08 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 17:36:08 +0200 |
commit | ca7325a2b1fb6bba48e13afe4dce070e29467cc5 (patch) | |
tree | e79f09ad62296d22a6e26bf1f107a1dfa3d4be89 /arch/arm/boot/dts/sama5d2.dtsi | |
parent | 4cb4261dc2908557d04c982060982d69e809c25c (diff) | |
parent | 27d90f46f253ccc7c5447f6fa62505acb1c246fe (diff) | |
download | linux-stable-ca7325a2b1fb6bba48e13afe4dce070e29467cc5.tar.gz linux-stable-ca7325a2b1fb6bba48e13afe4dce070e29467cc5.tar.bz2 linux-stable-ca7325a2b1fb6bba48e13afe4dce070e29467cc5.zip |
Merge tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into fixes
Fixes: second batch for 4.14:
- one DT phy address fix for the new sama5d27 som1 ek
- two DT ADC patches that were forgotten while moving to
hardware triggers for sama5d2 (iio changes already applied)
* tag 'at91-fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: dts: at91: sama5d2: add ADC hw trigger edge type
ARM: dts: at91: sama5d2_xplained: enable ADTRG pin
ARM: dts: at91: at91-sama5d27_som1: fix PHY ID
Diffstat (limited to 'arch/arm/boot/dts/sama5d2.dtsi')
-rw-r--r-- | arch/arm/boot/dts/sama5d2.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi index 38d2216c7ead..b1a26b42d190 100644 --- a/arch/arm/boot/dts/sama5d2.dtsi +++ b/arch/arm/boot/dts/sama5d2.dtsi @@ -1430,6 +1430,7 @@ atmel,min-sample-rate-hz = <200000>; atmel,max-sample-rate-hz = <20000000>; atmel,startup-time-ms = <4>; + atmel,trigger-edge-type = <IRQ_TYPE_EDGE_RISING>; status = "disabled"; }; |