ARM64: dts: colibri-imx8x: Add Atmel touchscreen

Add a setup for Atmel touchscreen controller to fully support
Toradex Capacitive Touch Display 7" Parallel and Capacitive Touch
Display 10.1" LVDS.

Related-to: #42580
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

3 files changed, 46 insertions, 33 deletions

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-aster.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-aster.dts
index 021896eaae6c..70af7cb58947 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-aster.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-aster.dts
@@ -87,6 +87,10 @@
 	};
 };
 
+&atmel_mxt_ts {
+	status = "okay";
+};
+
 &backlight {
 	brightness-levels = <0 45 63 88 119 158 203 255>;
 	default-brightness-level = <4>;
@@ -97,18 +101,6 @@
 /* Colibri I2C */
 &i2c1 {
 	status = "okay";
-
-	/* 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 = <&gpio3>;
-		interrupts = <20 IRQ_TYPE_EDGE_FALLING>;	/* SODIMM 107 */
-		reset-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;	/* SODIMM 106 */
-		status = "okay";
-	};
 };
 
 &iomuxc {
@@ -116,13 +108,6 @@
 	pinctrl-0 = <&pinctrl_hog0>, <&pinctrl_hog2>;
 
 	colibri-imx8qxp {
-		pinctrl_mxt_ts: mxt-ts {
-			fsl,pins = <
-				SC_P_QSPI0B_DATA2_LSIO_GPIO3_IO20	0x20	/* SODIMM 107 */
-				SC_P_QSPI0B_SS1_B_LSIO_GPIO3_IO24	0x20	/* SODIMM 106 */
-			>;
-		};
-
 		pinctrl_gpio_keys: gpiokeys {
 			fsl,pins = <
 				SC_P_QSPI0A_DATA1_LSIO_GPIO3_IO10	0x20	/* SODIMM  45 */
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
index 274547cf9dc4..c2f0f36979b9 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
@@ -30,6 +30,18 @@
 	status = "disabled";
 };
 
+/*
+ * Atmel maxtouch controller
+ * To enable it, you should disable pwm0 (PWM_B) and pwm1 (PWM_C)
+ */
+&atmel_mxt_ts {
+        pinctrl-0 = <&pinctrl_pwm_b &pinctrl_pwm_c>;
+        interrupt-parent = <&gpio0>;
+        interrupts = <21 IRQ_TYPE_EDGE_FALLING>;        /* SODIMM 28 */
+        reset-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;     /* SODIMM 30 */
+	status = "okay";
+};
+
 &backlight {
 	brightness-levels = <0 45 63 88 119 158 203 255>;
 	default-brightness-level = <4>;
@@ -155,17 +167,6 @@
 
 &i2c1 {
 	status = "okay";
-
-	atmel_mxt_ts: atmel_mxt_ts@4a {
-		compatible = "atmel,maxtouch";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_touch>;
-		reg = <0x4a>;
-		interrupt-parent = <&gpio3>;
-		interrupts = <21 IRQ_TYPE_EDGE_FALLING>;	/* SODIMM  98 */
-		reset-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;	/* SODIMM 133 */
-		status = "okay";
-	};
 };
 
 &pixel_combiner {
@@ -207,3 +208,13 @@
 &prg9 {
 	status = "okay";
 };
+
+/* Colibri PWM_B */
+&pwm0 {
+	status = "disabled";
+};
+
+/* Colibri PWM_C */
+&pwm1 {
+	status = "disabled";
+};
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi
index 2a48de0daf4b..564bf90583cb 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi
@@ -243,12 +243,24 @@
 	clock-frequency = <100000>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c1>;
+
+	/* 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 = <&gpio3>;
+		interrupts = <20 IRQ_TYPE_EDGE_FALLING>;	/* SODIMM 107 */
+		reset-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;	/* SODIMM 106 */
+                status = "disabled";
+        };
 };
 
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_hog0>, <&pinctrl_hog1>, <&pinctrl_hog2>,
-			<&pinctrl_ext_io0>;
+			<&pinctrl_ext_io0>, <&pinctrl_mxt_ts>;
 
 	colibri-imx8qxp {
 		/* On-module touch pen-down interrupt */
@@ -389,7 +401,6 @@
 				SC_P_SAI0_TXD_LSIO_GPIO0_IO25			0x20		/* SODIMM 103 */
 				SC_P_CSI_D01_CI_PI_D03				0x61		/* SODIMM 103 */
 				SC_P_QSPI0B_DATA1_LSIO_GPIO3_IO19		0x20		/* SODIMM 105 */
-				SC_P_QSPI0B_DATA2_LSIO_GPIO3_IO20		0x20		/* SODIMM 107 */
 				SC_P_USB_SS3_TC2_LSIO_GPIO4_IO05		0x20		/* SODIMM 127 */
 				SC_P_USB_SS3_TC3_LSIO_GPIO4_IO06		0x20		/* SODIMM 131 */
 				SC_P_USB_SS3_TC1_LSIO_GPIO4_IO04		0x20		/* SODIMM 133 */
@@ -398,7 +409,6 @@
 				SC_P_SAI1_RXFS_LSIO_GPIO0_IO31			0x20		/* SODIMM 100 */
 				SC_P_QSPI0B_DQS_LSIO_GPIO3_IO22			0x20		/* SODIMM 102 */
 				SC_P_QSPI0B_SS0_B_LSIO_GPIO3_IO23		0x20		/* SODIMM 104 */
-				SC_P_QSPI0B_SS1_B_LSIO_GPIO3_IO24		0x20		/* SODIMM 106 */
 			>;
 		};
 
@@ -720,6 +730,13 @@
 				SC_P_SCU_BOOT_MODE3_SCU_DSC_RTC_CLOCK_OUTPUT_32K 0x20
 			>;
 		};
+
+		pinctrl_mxt_ts: mxt-ts {
+			fsl,pins = <
+				SC_P_QSPI0B_DATA2_LSIO_GPIO3_IO20		0x20		/* SODIMM 107 */
+				SC_P_QSPI0B_SS1_B_LSIO_GPIO3_IO24		0x20		/* SODIMM 106 */
+			>;
+		};
 	};
 };