diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-26 21:45:09 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-26 21:45:09 +0300 |
| commit | 760c53f2781a04c52689276214694a36db8a7e43 (patch) | |
| tree | 13ca217edaebeceb4a5555834b0b4430f0a2d6ea /arch/arm | |
| parent | 21a9883f573e9142c64a39cfb35fbd1b7d46c579 (diff) | |
| parent | a642693882ce417683012a211ca9d6e65bae1dc4 (diff) | |
| download | linux-760c53f2781a04c52689276214694a36db8a7e43.tar.xz | |
Merge tag 'at91-ab-4.18-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
AT91 DT for 4.18:
- small DT improvements without functional changes
* tag 'at91-ab-4.18-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: dts: at91-sama5d2_xplained: Use IRQ_TYPE specifier
ARM: dts: at91: sama5d4ek: use canonical compatible for touchscreen
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d4ek.dts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index e4bbb7e0f793..fcc85d70f36e 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -232,7 +232,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_charger_chglev &pinctrl_charger_lbo &pinctrl_charger_irq>; interrupt-parent = <&pioA>; - interrupts = <PIN_PB13 GPIO_ACTIVE_LOW>; + interrupts = <PIN_PB13 IRQ_TYPE_EDGE_RISING>; active-semi,chglev-gpios = <&pioA PIN_PA12 GPIO_ACTIVE_HIGH>; active-semi,lbo-gpios = <&pioA PIN_PC8 GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts index 7887a7160a54..0702a2f2b336 100644 --- a/arch/arm/boot/dts/at91-sama5d4ek.dts +++ b/arch/arm/boot/dts/at91-sama5d4ek.dts @@ -129,8 +129,8 @@ wakeup-source; }; - atmel_mxt_ts@4c { - compatible = "atmel,atmel_mxt_ts"; + touchscreen@4c { + compatible = "atmel,maxtouch"; reg = <0x4c>; interrupt-parent = <&pioE>; interrupts = <24 0x0>; |