From ba560059bcdd4eb56de8921d9b031340cce01d8b Mon Sep 17 00:00:00 2001
From: Philippe Schenker <philippe.schenker@toradex.com>
Date: Mon, 24 Aug 2020 16:37:44 +0200
Subject: Revert "colibri-imx6: aster: convert atmel mxt to syntactic sugar"

This reverts commit 22b7998423337415dc898a64b556346f75e4f8d7.

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/colibri-imx6-aster_atmel-mxt_overlay.dts | 61 +++++++++++------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/overlays/colibri-imx6-aster_atmel-mxt_overlay.dts b/overlays/colibri-imx6-aster_atmel-mxt_overlay.dts
index 71798cb..11fd1ea 100644
--- a/overlays/colibri-imx6-aster_atmel-mxt_overlay.dts
+++ b/overlays/colibri-imx6-aster_atmel-mxt_overlay.dts
@@ -3,39 +3,38 @@
 /dts-v1/;
 /plugin/;
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-#include <imx6dl-pinfunc.h>
-
 / {
 	compatible = "toradex,colibri_imx6dl";
-};
-
-&i2c3 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	atmel_mxt_ts: atmel_mxt_ts@4a {
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_atmel_mxt_ts>;
-		compatible = "atmel,maxtouch";
-		reg = <0x4a>;
-		interrupt-parent = <&gpio2>;
-		interrupts = <24 IRQ_TYPE_EDGE_FALLING>;
-		reset-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
-		status = "okay";
+	fragment@0 {
+		target = <&weim>;
+		__overlay__{
+			status = "disabled";
+		};
 	};
-};
-
-&iomuxc {
-	pinctrl_atmel_mxt_ts: atmelmxttsgrp {
-		fsl,pins = <
-			MX6QDL_PAD_SD2_DAT1__GPIO1_IO14	0x1b0b1
-			MX6QDL_PAD_EIM_CS1__GPIO2_IO24	0x1b0b1
-		>;
+	fragment@1 {
+		target = <&iomuxc>;
+		__overlay__ {
+			pinctrl_atmel_mxt_ts: atmelmxttsgrp {
+				fsl,pins = <
+					0x300 0x6e8 0x000 0x5 0x0	0x1b0b1
+					0x140 0x510 0x000 0x5 0x0	0x1b0b1
+				>;
+			};
+		};
+	};
+	fragment@2 {
+		target = <&i2c3>;
+		__overlay__ {
+			atmel_mxt_ts: atmel_mxt_ts@4a {
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_atmel_mxt_ts>;
+				compatible = "atmel,maxtouch";
+				reg = <0x4a>;
+				interrupt-parent = <&gpio2>;
+				interrupts = <24 2>;
+				reset-gpios = <&gpio1 14 0>;
+				status = "okay";
+			};
+		};
 	};
-};
-
-&weim {
-	status = "disabled";
 };
-- 
cgit v1.2.3