From c626d5e57c7848cd93d9789b038565bd9e411e70 Mon Sep 17 00:00:00 2001
From: Philippe Schenker <philippe.schenker@toradex.com>
Date: Mon, 24 Aug 2020 16:36:28 +0200
Subject: Revert "apalis-imx8x: convert atmel mxt to syntactic sugar"

This reverts commit 009f4c7f7dc5d977e015ea1f272ee0dad779fc1a.

Syntactic sugar is not fully supported on 4.14 kernel revert all
overlays for this branch

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---
 overlays/apalis-imx8x_atmel-mxt_overlay.dts | 53 +++++++++++++++--------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/overlays/apalis-imx8x_atmel-mxt_overlay.dts b/overlays/apalis-imx8x_atmel-mxt_overlay.dts
index f14dfe8..1cb649f 100644
--- a/overlays/apalis-imx8x_atmel-mxt_overlay.dts
+++ b/overlays/apalis-imx8x_atmel-mxt_overlay.dts
@@ -9,34 +9,35 @@
 
 / {
 	compatible = "toradex,apalis-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_touch>;
-		reg = <0x4a>;
-		interrupt-parent = <&gpio3>;
-		interrupts = <17 IRQ_TYPE_EDGE_FALLING>;    /* Apalis GPIO5 */
-		reset-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */
-		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_touch>;
+				reg = <0x4a>;
+				interrupt-parent = <&gpio3>;
+				interrupts = <17 IRQ_TYPE_EDGE_FALLING>;    /* Apalis GPIO5 */
+				reset-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */
+				status = "okay";
+			};
+		};
 	};
-};
 
-&iomuxc {
-	apalis-imx8qxp {
-		/* Apalis GPIO5+6 */
-		pinctrl_touch: touchgrp {
-			fsl,pins = <
-				SC_P_QSPI0B_SCLK_LSIO_GPIO3_IO17		0x21		/* MXM3 11 */
-				SC_P_QSPI0B_DATA0_LSIO_GPIO3_IO18		0x21		/* MXM3 13 */
-			>;
+	fragment@1 {
+		target = <&iomuxc>;
+		__overlay__ {
+			apalis-imx8qxp {
+				/* Apalis GPIO5+6 */
+				pinctrl_touch: touchgrp {
+					fsl,pins = <
+						SC_P_QSPI0B_SCLK_LSIO_GPIO3_IO17		0x21		/* MXM3 11 */
+						SC_P_QSPI0B_DATA0_LSIO_GPIO3_IO18		0x21		/* MXM3 13 */
+					>;
+				};
+			};
 		};
 	};
 };
-
-- 
cgit v1.2.3