Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 760c53f2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.18-dt' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 21a9883f a6426938

arch/arm/boot/dts/at91-sama5d2_xplained.dts

+1 −1
Original line number Diff line number Diff line
@@ -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>;

arch/arm/boot/dts/at91-sama5d4ek.dts

+2 −2
Original line number Diff line number Diff line
@@ -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>;