ARM: dts: colibri-imx7: Restore TS nodes for NAND modules

Keep touchscreen and display nodes enabled for imx7 NAND modules,
since overlays for them are not supported yet.

For eMMC keep nodes disadled to apply overlays on it.

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

4 files changed, 57 insertions, 4 deletions

diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index ab8fa091adb8..69b8c9f1e638 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -14,7 +14,7 @@
 		default-brightness-level = <4>;
 		enable-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
 		pwms = <&pwm1 0 6666667 PWM_POLARITY_INVERTED>;
-		status = "disabled";
+		status = "okay";
 	};
 
 	pxp_v4l2_out {
@@ -349,7 +349,7 @@
 		adi,median-filter-size = /bits/ 8 <2>;
 		adi,averaging = /bits/ 8 <1>;
 		adi,conversion-interval = /bits/ 8 <255>;
-		status = "disabled";
+		status = "okay";
 	};
 
 	pmic@33 {
@@ -429,7 +429,7 @@
 	pinctrl-1 = <&pinctrl_i2c4_recovery>;
 	scl-gpios = <&gpio7 8 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
 	sda-gpios = <&gpio7 9 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
-        status = "disabled";
+        status = "okay";
 
         /* Atmel maxtouch controller */
         atmel_mxt_ts: touchscreen@4a {
@@ -440,7 +440,7 @@
                 interrupt-parent = <&gpio2>;
                 interrupts = <15 IRQ_TYPE_EDGE_FALLING>;        /* SODIMM_107, INT */
                 reset-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;     /* SODIMM_106, RST */
-                status = "disabled";
+                status = "okay";
         };
 
 
@@ -464,6 +464,7 @@
 	pinctrl-0 = <&pinctrl_lcdif_dat
 		     &pinctrl_lcdif_ctrl>;
 	display = <&display0>;
+	status = "okay";
 
 	display0: lcd-display {
 		bits-per-pixel = <16>;
diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
index e1c3b23e81a1..2289a6562a78 100644
--- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
@@ -60,3 +60,23 @@
 &usdhc3 {
 	status = "okay";
 };
+
+&ad7879_ts {
+	status = "disabled";
+};
+
+&backlight {
+	status = "disabled";
+};
+
+&lcdif {
+	status = "disabled";
+};
+
+&pwm1 {
+	status = "disabled";
+};
+
+&atmel_mxt_ts {
+	status = "disabled";
+};
diff --git a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
index 61724138f629..0921aa8f9151 100644
--- a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
@@ -14,6 +14,22 @@
 		     "fsl,imx7d";
 };
 
+&atmel_mxt_ts {
+	pinctrl-0 = <&pinctrl_atmel_adapter>;
+	interrupt-parent = <&gpio1>;
+	interrupts = <9 IRQ_TYPE_EDGE_FALLING>;		/* SODIMM_28, INT */
+	reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;	/* SODIMM_30, RST */
+	status = "okay";
+};
+
+&pwm2 {
+	status = "disabled";
+};
+
+&pwm3 {
+	status = "disabled";
+};
+
 &usbotg2 {
 	vbus-supply = <&reg_usbh_vbus>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/imx7d-colibri-iris.dts b/arch/arm/boot/dts/imx7d-colibri-iris.dts
index 3f3d40c36e7a..ec1fe0676e2e 100644
--- a/arch/arm/boot/dts/imx7d-colibri-iris.dts
+++ b/arch/arm/boot/dts/imx7d-colibri-iris.dts
@@ -15,6 +15,22 @@
 		     "fsl,imx7d";
 };
 
+&atmel_mxt_ts {
+        pinctrl-0 = <&pinctrl_atmel_adapter>;
+        interrupt-parent = <&gpio1>;
+        interrupts = <9 IRQ_TYPE_EDGE_FALLING>;        /* SODIMM_28, INT */
+        reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;    /* SODIMM_30, RST */
+        status = "okay";
+};
+
+&pwm2 {
+        status = "disabled";
+};
+
+&pwm3 {
+        status = "disabled";
+};
+
 &usbotg2 {
 	vbus-supply = <&reg_usbh_vbus>;
 	status = "okay";