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

This reverts commit 02f08a0d21e558bb18f5ada89e7f690a7340fbb6.

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-imx8qm_atmel-mxt_overlay.dts | 53 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/overlays/apalis-imx8qm_atmel-mxt_overlay.dts b/overlays/apalis-imx8qm_atmel-mxt_overlay.dts
index 7a5679c..0c60ad6 100644
--- a/overlays/apalis-imx8qm_atmel-mxt_overlay.dts
+++ b/overlays/apalis-imx8qm_atmel-mxt_overlay.dts
@@ -9,34 +9,35 @@
 
 / {
 	compatible = "toradex,apalis-imx8qm";
-};
-
-&i2c2 {
-	#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 = <&gpio4>;
-		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;    /* Apalis GPIO5 */
-		reset-gpios = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */
-		status = "okay";
+	fragment@0 {
+		target = <&i2c2>;
+		__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 = <&gpio4>;
+				interrupts = <1 IRQ_TYPE_EDGE_FALLING>;    /* Apalis GPIO5 */
+				reset-gpios = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */
+				status = "okay";
+			};
+		};
 	};
-};
 
-&iomuxc {
-	apalis-imx8qm {
-		/* Apalis GPIO5+6 */
-		pinctrl_touch: touchgrp {
-			fsl,pins = <
-				SC_P_FLEXCAN2_RX_LSIO_GPIO4_IO01		0x06000021
-				SC_P_FLEXCAN2_TX_LSIO_GPIO4_IO02		0x06000021
-			>;
+	fragment@1 {
+		target = <&iomuxc>;
+		__overlay__ {
+			apalis-imx8qm {
+				/* Apalis GPIO5+6 */
+				pinctrl_touch: touchgrp {
+					fsl,pins = <
+						SC_P_FLEXCAN2_RX_LSIO_GPIO4_IO01		0x06000021
+						SC_P_FLEXCAN2_TX_LSIO_GPIO4_IO02		0x06000021
+					>;
+				};
+			};
 		};
 	};
 };
-
-- 
cgit v1.2.3