dts: colibri-imx6ull: added overlays split

For imx6ull none-emmc device trees enable:
- MXT TS over adapter or connector (board dependent);
- ad7879 support;
- Parallel RGB/VGA capability.

Related-to: ELB-4065

16 files changed, 130 insertions, 58 deletions

diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dts b/arch/arm/boot/dts/imx6ull-colibri-aster.dts
index c3adb82acf86..59652ef32bf2 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-aster.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+ OR MIT
 /*
- * Copyright 2017-2020 Toradex
+ * Copyright 2017-2021 Toradex
  */
 
 /dts-v1/;
@@ -14,3 +14,7 @@
 		     "toradex,colibri-imx6ull",
 		     "fsl,imx6ull";
 };
+
+&atmel_mxt_ts {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
index 93367e89466e..dde3f38faa28 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
@@ -107,11 +107,6 @@
 	};
 };
 
-/* ATMEL TS connector */
-&atmel_mxt_ts {
-	status = "okay";
-};
-
 /* PWM <A> */
 &pwm4 {
 	status = "okay";
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
index 671109d57e1c..715d567c3358 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
- * Copyright 2018 Toradex AG
+ * Copyright 2018-2021 Toradex
  */
 
 /dts-v1/;
@@ -14,3 +14,7 @@
 		     "toradex,colibri-imx6ull",
 		     "fsl,imx6ull";
 };
+
+&atmel_mxt_ts {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
index 99f9b1fb15c5..a3debdabdbca 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
@@ -123,8 +123,8 @@
 &atmel_mxt_ts {
         pinctrl-0 = <&pinctrl_atmel_adap>;
         interrupt-parent = <&gpio4>;
-        interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
-        reset-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
+        interrupts = <16 IRQ_TYPE_EDGE_FALLING>;   /* SODIMM 28, INT */
+        reset-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; /* SODIMM 30, RST */
         status = "disabled";
 };
 
diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts
index fc93eb3b16ee..1906b7dffef7 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
- * Copyright 2018 Toradex AG
+ * Copyright 2018-2021 Toradex
  */
 
 /dts-v1/;
@@ -14,3 +14,15 @@
 		     "toradex,colibri-imx6ull",
 		     "fsl,imx6ull";
 };
+
+&atmel_mxt_ts {
+	status = "okay";
+};
+
+&gpio1 {
+	lvds_tx_on {
+		gpio-hog;
+		gpios = <14 GPIO_ACTIVE_HIGH>;
+		output-high;
+	};
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi
index f91793344d0f..fa734dac574c 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi
@@ -113,11 +113,6 @@
 	status = "okay";
 };
 
-/* Atmel TS connector */
-&atmel_mxt_ts {
-	status = "okay";
-};
-
 /* Colibri UART_A */
 &uart1 {
 	status = "okay";
@@ -178,19 +173,6 @@
 };
 
 &gpio1 {
-	/*
-	 * lvds_tx_on turns the LVDS transceiver on. If one wants to turn the
-	 * transceiver off, that property has to be deleted and the gpio handled
-	 * in userspace.
-	 * The same applies to uart25_tx_on and uart1_tx_on, where the UART
-	 * transceiver is turned on.
-	 */
-	lvds_tx_on {
-		gpio-hog;
-		gpios = <14 0>;
-		output-high;
-	};
-
 	uart25_tx_on {
 		gpio-hog;
 		gpios = <15 0>;
diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dts b/arch/arm/boot/dts/imx6ull-colibri-iris.dts
index e3b8877613a5..0eb38ecc8f21 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-iris.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
- * Copyright 2018 Toradex AG
+ * Copyright 2018-2021 Toradex
  */
 
 /dts-v1/;
@@ -14,3 +14,7 @@
 		     "toradex,colibri-imx6ull",
 		     "fsl,imx6ull";
 };
+
+&atmel_mxt_ts {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi
index 6a80c16f06e4..c252cb4cfe39 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi
@@ -87,8 +87,8 @@
 &atmel_mxt_ts {
 	pinctrl-0 = <&pinctrl_atmel_adap>;
 	interrupt-parent = <&gpio4>;
-	interrupts = <16 IRQ_TYPE_EDGE_FALLING>;
-	reset-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
+	interrupts = <16 IRQ_TYPE_EDGE_FALLING>;   /* SODIMM 28, INT */
+	reset-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; /* SODIMM 30, RST */
 	status = "disabled";
 };
 
diff --git a/arch/arm/boot/dts/imx6ull-colibri-lcdif.dtsi b/arch/arm/boot/dts/imx6ull-colibri-lcdif.dtsi
index 569d1b844620..6c2ea9ad8c37 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-lcdif.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-lcdif.dtsi
@@ -93,7 +93,6 @@
 				vfront-porch = <11>;
 				hsync-len = <96>;
 				vsync-len = <2>;
-
 				de-active = <1>;
 				hsync-active = <0>;
 				vsync-active = <0>;
@@ -111,7 +110,6 @@
 				vfront-porch = <10>;
 				hsync-len = <128>;
 				vsync-len = <2>;
-
 				de-active = <1>;
 				hsync-active = <0>;
 				vsync-active = <0>;
@@ -128,7 +126,6 @@
 				vfront-porch = <10>;
 				hsync-len = <128>;
 				vsync-len = <2>;
-
 				de-active = <1>;
 				hsync-active = <0>;
 				vsync-active = <0>;
@@ -145,7 +142,6 @@
 				vfront-porch = <1>;
 				hsync-len = <128>;
 				vsync-len = <4>;
-
 				de-active = <1>;
 				hsync-active = <1>;
 				vsync-active = <1>;
@@ -162,7 +158,6 @@
 				vfront-porch = <20>;
 				hsync-len = <5>;
 				vsync-len = <5>;
-
 				de-active = <1>;
 				hsync-active = <0>;
 				vsync-active = <0>;
@@ -179,7 +174,22 @@
 				vfront-porch = <3>;
 				hsync-len = <136>;
 				vsync-len = <6>;
-
+				de-active = <1>;
+				hsync-active = <0>;
+				vsync-active = <0>;
+				pixelclk-active = <0>;
+			};
+			/* WXGA Timing, LT170410 display 10" */
+			timing_wxga: 1280x800 {
+				clock-frequency = <68930000>;
+				hactive = <1280>;
+				vactive = <800>;
+				hback-porch = <64>;
+				hfront-porch = <64>;
+				vback-porch = <5>;
+				vfront-porch = <5>;
+				hsync-len = <40>;
+				vsync-len = <6>;
 				de-active = <1>;
 				hsync-active = <0>;
 				vsync-active = <0>;
diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
index 60f169227ad9..a324b4fba8ca 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
- * Copyright 2018 Toradex AG
+ * Copyright 2018-2021 Toradex
  */
 
 #include "imx6ull-colibri.dtsi"
@@ -12,6 +12,14 @@
 	};
 };
 
+&ad7879_ts {
+	status = "okay";
+};
+
+&backlight {
+	status = "okay";
+};
+
 &gpio1 {
 	gpio-line-names = "SODIMM_8",
 			  "SODIMM_6",
@@ -149,6 +157,14 @@
 			  "SODIMM_127";
 };
 
+&i2c1 {
+	status = "okay";
+};
+
+&i2c2 {
+	status = "okay";
+};
+
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
@@ -159,3 +175,11 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio3>;
 };
+
+&lcdif {
+	status = "okay";
+};
+
+&pwm4 {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts
index d23fc5de772c..f1b4942564f5 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+ OR MIT
 /*
- * Copyright 2017-2020 Toradex
+ * Copyright 2017-2021 Toradex
  */
 
 /dts-v1/;
@@ -14,3 +14,7 @@
 		     "toradex,colibri-imx6ull",
 		     "fsl,imx6ull";
 };
+
+&atmel_mxt_ts {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts
index df72ce1ae2cb..ff2f1bea9827 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
- * Copyright 2018 Toradex AG
+ * Copyright 2018-2021 Toradex
  */
 
 /dts-v1/;
@@ -12,3 +12,7 @@
 	model = "Toradex Colibri iMX6ULL 512MB on Colibri Evaluation Board V3";
 	compatible = "toradex,colibri-imx6ull-wifi-eval", "fsl,imx6ull";
 };
+
+&atmel_mxt_ts {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts
index 202b50fc2cfa..95e28f5aac6d 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
- * Copyright 2018 Toradex AG
+ * Copyright 2018-2021 Toradex
  */
 
 /dts-v1/;
@@ -14,3 +14,15 @@
 		     "toradex,colibri-imx6ull",
 		     "fsl,imx6ull";
 };
+
+&atmel_mxt_ts {
+	status = "okay";
+};
+
+&gpio1 {
+	lvds_tx_on {
+		gpio-hog;
+		gpios = <14 GPIO_ACTIVE_HIGH>;
+		output-high;
+	};
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts
index 966d02a07b1c..15d893088616 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
- * Copyright 2018 Toradex AG
+ * Copyright 2018-2021 Toradex
  */
 
 /dts-v1/;
@@ -14,3 +14,7 @@
 		     "toradex,colibri-imx6ull",
 		     "fsl,imx6ull";
 };
+
+&atmel_mxt_ts {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
index 5619f40e49cb..237757d7df8b 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /*
- * Copyright 2018 Toradex AG
+ * Copyright 2018-2021 Toradex
  */
 
 #include "imx6ull-colibri.dtsi"
@@ -19,6 +19,14 @@
 	};
 };
 
+&ad7879_ts {
+	status = "okay";
+};
+
+&backlight {
+	status = "okay";
+};
+
 &gpio1 {
 	gpio-line-names = "SODIMM_8",
 			  "SODIMM_6",
@@ -155,6 +163,14 @@
 			  "SODIMM_105";
 };
 
+&i2c1 {
+	status = "okay";
+};
+
+&i2c2 {
+	status = "okay";
+};
+
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
@@ -167,6 +183,14 @@
 	pinctrl-0 = <&pinctrl_snvs_gpio1>;
 };
 
+&lcdif {
+	status = "okay";
+};
+
+&pwm4 {
+	status = "okay";
+};
+
 &usdhc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc2>;
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index 56f968d4b92c..e5edf740f5c7 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -154,7 +154,7 @@
 	pinctrl-1 = <&pinctrl_i2c1_gpio>;
 	sda-gpios = <&gpio1 29 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	scl-gpios = <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-	status = "okay";
+	status = "disabled";
 
 	/* Atmel maxtouch controller */
 	atmel_mxt_ts: touchscreen@4a {
@@ -188,9 +188,9 @@
 	pinctrl-1 = <&pinctrl_i2c2_gpio>;
 	sda-gpios = <&gpio1 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	scl-gpios = <&gpio1 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-	status = "okay";
+	status = "disabled";
 
-	ad7879@2c {
+	ad7879_ts: touchscreen@2c {
 		compatible = "adi,ad7879-1";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_snvs_ad7879_int>;
@@ -204,21 +204,10 @@
 		adi,median-filter-size = /bits/ 8 <2>;
 		adi,averaging = /bits/ 8 <1>;
 		adi,conversion-interval = /bits/ 8 <255>;
+		status = "disabled";
 	};
 };
 
-&backlight {
-	status = "okay";
-};
-
-&lcdif {
-	status = "okay";
-};
-
-&pwm4 {
-	status = "okay";
-};
-
 &pwm5 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm5>;