overlays: colibri-imx8x: add atmel mxt overlay for adapter

Add an overlay that supports connecting displays with
Capacitive Touch Adapter.
Simplify atmel mxt overlays.

Now the common scheme for atmel mxt overlays:
atmel-mxt-connector - uses 107/106 pins for INT/Reset signals;
atmel-mxt-adapter   - uses 28/30 pins for INT/Reset signals.

Related-to: ELB-3246
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

4 files changed, 50 insertions, 42 deletions

diff --git a/overlays/Makefile b/overlays/Makefile
index 09e44c6..9bda199 100644
--- a/overlays/Makefile
+++ b/overlays/Makefile
@@ -52,7 +52,8 @@ dtb-y += colibri-imx7-eval_spidev_overlay.dtbo
 dtb-y += colibri-imx7_lcd-lt161010_overlay.dtbo
 dtb-y += colibri-imx8x-eval_spidev_overlay.dtbo
 dtb-y += colibri-imx8x_ad7879_overlay.dtbo
-dtb-y += colibri-imx8x_atmel-mxt_overlay.dtbo
+dtb-y += colibri-imx8x_atmel-mxt-adapter_overlay.dtbo
+dtb-y += colibri-imx8x_atmel-mxt-connector_overlay.dtbo
 dtb-y += colibri-imx8x_parallel-rgb_overlay.dtbo
 dtb-y += colibri-imx8x_dsihdmi_overlay.dtbo
 dtb-y += display-dpi-lt170410_overlay.dtbo
diff --git a/overlays/colibri-imx8x_atmel-mxt-adapter_overlay.dts b/overlays/colibri-imx8x_atmel-mxt-adapter_overlay.dts
new file mode 100644
index 0000000..4f4a968
--- /dev/null
+++ b/overlays/colibri-imx8x_atmel-mxt-adapter_overlay.dts
@@ -0,0 +1,32 @@
+// Atmel MXT touchscreen for Capacitive Touch Adapter.
+// Supports the 7inch and 10inch capacitive touch displays orderable at Toradex.
+
+/dts-v1/;
+/plugin/;
+
+#include "dt-bindings/interrupt-controller/irq.h"
+#include "dt-bindings/gpio/gpio.h"
+
+/ {
+	compatible = "toradex,colibri-imx8x";
+};
+
+&atmel_mxt_ts {
+	pinctrl-0 = <&pinctrl_atmel_adap>;
+	interrupt-parent = <&lsio_gpio0>;
+	interrupts = <21 IRQ_TYPE_EDGE_FALLING>;		/* SODIMM 28 */
+	reset-gpios = <&lsio_gpio0 22 GPIO_ACTIVE_HIGH>;	/* SODIMM 30 */
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+};
+
+&pwm0 {
+	status = "disabled";
+};
+
+&pwm1 {
+	status = "disabled";
+};
diff --git a/overlays/colibri-imx8x_atmel-mxt-connector_overlay.dts b/overlays/colibri-imx8x_atmel-mxt-connector_overlay.dts
new file mode 100644
index 0000000..20e85c6
--- /dev/null
+++ b/overlays/colibri-imx8x_atmel-mxt-connector_overlay.dts
@@ -0,0 +1,16 @@
+// Atmel MXT touchscreen for boards with TS connector. Supports the 7inch and 10inch display orderable at Toradex.
+
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "toradex,colibri-imx8x";
+};
+
+&i2c1 {
+	status = "okay";
+};
+
+&atmel_mxt_ts {
+	status = "okay";
+};
diff --git a/overlays/colibri-imx8x_atmel-mxt_overlay.dts b/overlays/colibri-imx8x_atmel-mxt_overlay.dts
deleted file mode 100644
index 62381dd..0000000
--- a/overlays/colibri-imx8x_atmel-mxt_overlay.dts
+++ /dev/null
@@ -1,41 +0,0 @@
-// Atmel MXT touchscreen for the 7inch and 10inch display orderable at Toradex.
-
-/dts-v1/;
-/plugin/;
-
-#include "dt-bindings/interrupt-controller/irq.h"
-#include "dt-bindings/gpio/gpio.h"
-#include "dt-bindings/pinctrl/pads-imx8qxp.h"
-
-/ {
-	compatible = "toradex,colibri-imx8x";
-};
-
-&i2c1 {
-	#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_mxt_ts>;
-		reg = <0x4a>;
-		interrupt-parent = <&lsio_gpio3>;
-		interrupts = <20 IRQ_TYPE_EDGE_FALLING>;		/* SODIMM 107 */
-		reset-gpios = <&lsio_gpio3 24 GPIO_ACTIVE_HIGH>;	/* SODIMM 106 */
-		status = "okay";
-	};
-};
-
-&iomuxc {
-	colibri-imx8qxp {
-		pinctrl_mxt_ts: mxt-ts {
-			fsl,pins = <
-				IMX8QXP_QSPI0B_DATA2_LSIO_GPIO3_IO20		0x20		/* SODIMM 107 */
-				IMX8QXP_QSPI0B_SS1_B_LSIO_GPIO3_IO24		0x20		/* SODIMM 106 */
-			>;
-		};
-	};
-};
-