ARM: dts: colibri-imx6ull: add touchscreen device nodes

Move all atmel and fusion touchscreen nodes from board-level
to the main module DT. Prepare the DTs for
use with atmel mxt overlays, adding required pinmux groups.

The common scheme of pin groups for TS overlays:
- pinctrl_atmel_conn - SODIMM 106/107 pins for INT/RST (default)
- pinctrl_atmel_adap - SODIMM   28/30 pins for INT/RST signals.

Related-to: ELB-3868
Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>

1 files changed, 13 insertions, 28 deletions

diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
index 19972a2ed59a..99f9b1fb15c5 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
@@ -112,34 +112,6 @@
 &i2c1 {
 	status = "okay";
 
-	/*
-	 * the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm5,
-	 * pwm6. so if you enable one of the PCAP controllers disable the pwms
-	 */
-	atmel_mxt_ts: atmel_mxt_ts@4a {
-		compatible = "atmel,maxtouch";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpiotouch>;
-		reg = <0x4a>;
-		interrupt-parent = <&gpio4>;
-		interrupts = <16 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */
-		reset-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */
-		status = "okay";
-	};
-
-	touch: touchrevf0710a@10 {
-		compatible = "touchrevolution,fusion-f0710a";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpiotouch>;
-		reg = <0x10>;
-			/* SODIMM 28, Pen down interrupt */
-		gpios = <&gpio4 16 GPIO_ACTIVE_HIGH
-			/* SODIMM 30, Reset interrupt */
-			 &gpio2 5 GPIO_ACTIVE_LOW
-			>;
-		status = "disabled";
-	};
-
 	/* M41T0M6 real time clock on carrier board */
 	m41t0m6: rtc@68 {
 		compatible = "st,m41t0";
@@ -148,11 +120,24 @@
 };
 
 
+&atmel_mxt_ts {
+        pinctrl-0 = <&pinctrl_atmel_adap>;
+        interrupt-parent = <&gpio4>;
+        interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
+        reset-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
+        status = "disabled";
+};
+
 /* PWM <A> */
 &pwm4 {
 	status = "okay";
 };
 
+/*
+ * the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm5,
+ * pwm6. so if you enable one of the PCAP controllers disable the pwms
+ */
+
 /* PWM <B> */
 &pwm5 {
 	status = "okay";