From f8e8c2ddfa9e2d48dc158e17571c11631883f6b3 Mon Sep 17 00:00:00 2001
From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Date: Wed, 19 Aug 2020 16:51:32 +0300
Subject: colibri-imx7: eval: convert atmel mxt to syntactic sugar

Convert an overlay file for Atmel MXT multitouch adapter
for Colibri iMX7 module + Evaluation Board into Syntactic Sugar format.
This format is strongly recommended in Embedded Linux Wiki [1].

[1] https://elinux.org/Device_Tree_Reference#Overlay_Source_Format

Related-to: ELB-2834
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
---
 overlays/colibri-imx7-eval_atmel-mxt_overlay.dts | 81 ++++++++++++------------
 1 file changed, 39 insertions(+), 42 deletions(-)

diff --git a/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts b/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts
index 2f29eff..b63394d 100644
--- a/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts
+++ b/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts
@@ -3,50 +3,47 @@
 /dts-v1/;
 /plugin/;
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <imx7d-pinfunc.h>
+
 / {
 	compatible = "toradex,colibri-imx7d-emmc";
-	fragment@0 {
-		target = <&i2c4>;
-		__overlay__ {
-			atmel_mxt_ts: atmel_mxt_ts@4a {
-			pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_atmel_mxt_ts>;
-			compatible = "atmel,maxtouch";
-			reg = <0x4a>;
-			interrupt-parent = <&gpio1>;
-			interrupts = <9 2>;
-			reset-gpios = <&gpio1 10 0>;
-			status = "okay";
-			};
-		};
-	};
-	fragment@1 {
-		target = <&pwm2>;
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-	fragment@2 {
-		target = <&pwm3>;
-		__overlay__{
-			status = "disabled";
-		};
-	};
-	fragment@3 {
-		target = <&iomuxc_lpsr>;
-		__overlay__ {
-			pinctrl_atmel_mxt_ts: atmelmxttsgrp {
-				fsl,pins = <
-					0x0018 0x0270 0x0000 0x0 0x0 0x59
-					0x001C 0x0274 0x0000 0x0 0x0 0x59
-				>;
-			};
-		};
+};
+
+&i2c4 {
+	#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 = <&gpio1>;
+		interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
+		reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+		status = "okay";
 	};
-	fragment@4 {
-		target = <&uart1>;
-		__overlay__ {
-			pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>;
-		};
+};
+
+&iomuxc_lpsr  {
+	pinctrl_atmel_mxt_ts: atmelmxttsgrp {
+		fsl,pins = <
+			MX7D_PAD_GPIO1_IO09__GPIO1_IO9	0x59
+			MX7D_PAD_GPIO1_IO10__GPIO1_IO10	0x59
+		>;
 	};
 };
+
+&uart1 {
+	pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>;
+};
+
+&pwm2 {
+	status = "disabled";
+};
+
+&pwm3 {
+	status = "disabled";
+};
-- 
cgit v1.2.3