overlays: colibri-imx7: add connector and adapter overlays

Add overlays for:
 - Atmel MXT TS for boards with Capacitive Touch Connector
 - Atmel MXT TS for Capacitive Touch Adapter
 - Fusion F0710A TS for boards with Capacitive Touch Connector
 - Fusion F0710A TS for Capacitive Touch Adapter

Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>

5 files changed, 67 insertions, 94 deletions

diff --git a/overlays/Makefile b/overlays/Makefile
index 13bd5bc..421a1e5 100644
--- a/overlays/Makefile
+++ b/overlays/Makefile
@@ -34,9 +34,9 @@ dtb-y += colibri-imx6_hdmi_overlay.dtbo
 dtb-y += colibri-imx6_parallel-rgb_overlay.dtbo
 dtb-y += colibri-imx6_stmpe-ts_overlay.dtbo
 dtb-y += colibri-imx7_ad7879_overlay.dtbo
-dtb-y += colibri-imx7-aster_atmel-mxt_overlay.dtbo
-dtb-y += colibri-imx7-eval_atmel-mxt_overlay.dtbo
 dtb-y += colibri-imx7_parallel-rgb_overlay.dtbo
+dtb-y += colibri-imx7_atmel-mxt-adapter_overlay.dtbo
+dtb-y += colibri-imx7_atmel-mxt-connector_overlay.dtbo
 dtb-y += display-dpi-lt170410_overlay.dtbo
 dtb-y += display-edt5.7_overlay.dtbo
 dtb-y += display-edt7_overlay.dtbo
diff --git a/overlays/colibri-imx7-aster_atmel-mxt_overlay.dts b/overlays/colibri-imx7-aster_atmel-mxt_overlay.dts
deleted file mode 100644
index 7527480..0000000
--- a/overlays/colibri-imx7-aster_atmel-mxt_overlay.dts
+++ /dev/null
@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/*
- * Copyright 2020-2021 Toradex
- */
-
-// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Aster board.
-
-/dts-v1/;
-/plugin/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/interrupt-controller/irq.h>
-
-/ {
-	compatible = "toradex,colibri-imx7d-emmc";
-};
-
-&i2c4 {
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	atmel_mxt_ts: atmel_mxt_ts@4a {
-		compatible = "atmel,maxtouch";
-		reg = <0x4a>;
-		interrupt-parent = <&gpio2>;
-		interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
-		reset-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;
-		status = "okay";
-	};
-};
-
-&pwm2 {
-	status = "disabled";
-};
-
-&pwm3 {
-	status = "disabled";
-};
diff --git a/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts b/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts
deleted file mode 100644
index 3622d30..0000000
--- a/overlays/colibri-imx7-eval_atmel-mxt_overlay.dts
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/*
- * Copyright 2020-2021 Toradex
- */
-
-// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Evaluation or Iris board.
-
-/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";
-};
-
-&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";
-	};
-};
-
-&iomuxc_lpsr {
-	pinctrl_atmel_mxt_ts: atmelmxttsgrp {
-		fsl,pins = <
-			MX7D_PAD_GPIO1_IO09__GPIO1_IO9	0x59
-			MX7D_PAD_GPIO1_IO10__GPIO1_IO10	0x59
-		>;
-	};
-};
-
-&pwm2 {
-	status = "disabled";
-};
-
-&pwm3 {
-	status = "disabled";
-};
-
-&uart1 {
-	pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>;
-};
diff --git a/overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts b/overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts
new file mode 100644
index 0000000..6a331e6
--- /dev/null
+++ b/overlays/colibri-imx7_atmel-mxt-adapter_overlay.dts
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2020-2021 Toradex
+ */
+
+// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Evaluation or Iris board.
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <imx7d-pinfunc.h>
+
+/ {
+	compatible = "toradex,colibri-imx7d",
+		     "toradex,colibri-imx7s",
+		     "toradex,colibri-imx7d-emmc";
+};
+
+&atmel_mxt_ts {
+	pinctrl-0 = <&pinctrl_atmel_adapter>;
+	interrupt-parent = <&gpio1>;
+	interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
+	reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};
+
+&i2c4 {
+	status = "okay";
+};
+
+&pwm2 {
+	status = "disabled";
+};
+
+&pwm3 {
+	status = "disabled";
+};
diff --git a/overlays/colibri-imx7_atmel-mxt-connector_overlay.dts b/overlays/colibri-imx7_atmel-mxt-connector_overlay.dts
new file mode 100644
index 0000000..d6000c7
--- /dev/null
+++ b/overlays/colibri-imx7_atmel-mxt-connector_overlay.dts
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2020-2021 Toradex
+ */
+
+// Atmel touchscreen for the 7inch capacitive display orderable at Toradex. Use this devicetree on the Aster board.
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+	compatible = "toradex,colibri-imx7d",
+		     "toradex,colibri-imx7s",
+		     "toradex,colibri-imx7d-emmc";
+};
+
+&atmel_mxt_ts {
+	status = "okay";
+};
+
+&i2c4 {
+	status = "okay";
+};