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

This reverts commit f619223c02cea2df421ae8c95b988e5050af18c4.

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_ad7879_overlay.dts | 62 ++++++++++++++++----------------
 1 file changed, 32 insertions(+), 30 deletions(-)

(limited to 'overlays')

diff --git a/overlays/apalis-imx8x_ad7879_overlay.dts b/overlays/apalis-imx8x_ad7879_overlay.dts
index 50022a9..84511cb 100644
--- a/overlays/apalis-imx8x_ad7879_overlay.dts
+++ b/overlays/apalis-imx8x_ad7879_overlay.dts
@@ -9,38 +9,40 @@
 
 / {
 	compatible = "toradex,apalis-imx8qxp";
-};
-
-&i2c0 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	/* Touch controller */
-	ad7879@2c {
-		compatible = "adi,ad7879-1";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_ad7879_int>;
-		reg = <0x2c>;
-		interrupt-parent = <&gpio3>;
-		interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
-		touchscreen-max-pressure = <4096>;
-		adi,resistance-plate-x = <120>;
-		adi,first-conversion-delay = /bits/ 8 <3>;
-		adi,acquisition-time = /bits/ 8 <1>;
-		adi,median-filter-size = /bits/ 8 <2>;
-		adi,averaging = /bits/ 8 <1>;
-		adi,conversion-interval = /bits/ 8 <255>;
+	fragment@0 {
+		target = <&i2c0>;
+		__overlay__ {
+			/* Touch controller */
+			ad7879@2c {
+				compatible = "adi,ad7879-1";
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_ad7879_int>;
+				reg = <0x2c>;
+				interrupt-parent = <&gpio3>;
+				interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
+				touchscreen-max-pressure = <4096>;
+				adi,resistance-plate-x = <120>;
+				adi,first-conversion-delay = /bits/ 8 <3>;
+				adi,acquisition-time = /bits/ 8 <1>;
+				adi,median-filter-size = /bits/ 8 <2>;
+				adi,averaging = /bits/ 8 <1>;
+				adi,conversion-interval = /bits/ 8 <255>;
+			};
+		};
 	};
-};
 
-&iomuxc {
-	apalis-imx8qxp {
-		/* On-module touch pen-down interrupt */
-		pinctrl_ad7879_int: ad7879-int {
-			fsl,pins = <
-				SC_P_MIPI_CSI0_I2C0_SCL_LSIO_GPIO3_IO05		0x21
-			>;
+	fragment@1 {
+		target = <&iomuxc>;
+		__overlay__ {
+			apalis-imx8qxp {
+				/* On-module touch pen-down interrupt */
+				pinctrl_ad7879_int: ad7879-int {
+					fsl,pins = <
+						SC_P_MIPI_CSI0_I2C0_SCL_LSIO_GPIO3_IO05		0x21
+					>;
+				};
+			};
 		};
 	};
-};
 
+};
-- 
cgit v1.2.3