From 24769e38a66e2e3340d76811f7efd92b154c5806 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Mon, 24 Aug 2020 16:37:16 +0200 Subject: Revert "colibri-imx8x: convert atmel mxt to syntactic sugar" This reverts commit 5ddd1fabf90c0760459d4a9d2088d8f54b82e993. Syntactic sugar is not fully supported on 4.14 kernel revert all overlays for this branch Signed-off-by: Philippe Schenker --- overlays/colibri-imx8x_atmel-mxt_overlay.dts | 50 +++++++++++++++------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/overlays/colibri-imx8x_atmel-mxt_overlay.dts b/overlays/colibri-imx8x_atmel-mxt_overlay.dts index 56dd229..1c4f74b 100644 --- a/overlays/colibri-imx8x_atmel-mxt_overlay.dts +++ b/overlays/colibri-imx8x_atmel-mxt_overlay.dts @@ -9,33 +9,35 @@ / { compatible = "toradex,colibri-imx8qxp"; -}; - -&i2c1 { - #address-cells = <1>; - #size-cells = <0>; - /* Atmel maxtouch controller */ - atmel_mxt_ts: atmel_mxt_ts@4a { - compatible = "atmel,maxtouch"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_mxt_ts>; - reg = <0x4a>; - interrupt-parent = <&gpio3>; - interrupts = <20 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 */ - reset-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */ - status = "okay"; + fragment@0 { + target = <&i2c1>; + __overlay__ { + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mxt_ts>; + reg = <0x4a>; + interrupt-parent = <&gpio3>; + interrupts = <20 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107 */ + reset-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; /* SODIMM 106 */ + status = "okay"; + }; + }; }; -}; -&iomuxc { - colibri-imx8qxp { - pinctrl_mxt_ts: mxt-ts { - fsl,pins = < - SC_P_QSPI0B_DATA2_LSIO_GPIO3_IO20 0x20 /* SODIMM 107 */ - SC_P_QSPI0B_SS1_B_LSIO_GPIO3_IO24 0x20 /* SODIMM 106 */ - >; + fragment@1 { + target = <&iomuxc>; + __overlay__ { + colibri-imx8qxp { + pinctrl_mxt_ts: mxt-ts { + fsl,pins = < + SC_P_QSPI0B_DATA2_LSIO_GPIO3_IO20 0x20 /* SODIMM 107 */ + SC_P_QSPI0B_SS1_B_LSIO_GPIO3_IO24 0x20 /* SODIMM 106 */ + >; + }; + }; }; }; }; - -- cgit v1.2.3