ARM: dts: colibri-imx7: revert disable/enable display subsystems

It is more natural to keep disabled all display stuff for eMMC modules,
which support overlays, and enable the display subsystems for NAND
modules by default.
It reduces the code and make it easier to understand.

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

10 files changed, 61 insertions, 50 deletions

diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index afeb66a70ab4..279681042628 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -125,10 +125,12 @@
 };
 
 &pwm2 {
+	/* The pwm2 should be disabled to enable atmel_mxt_ts touchscreen for adapter. */
 	status = "okay";
 };
 
 &pwm3 {
+	/* The pwm2 should be disabled to enable atmel_mxt_ts touchscreen for adapter. */
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi
index f5d13ab57c46..6e43dba34544 100644
--- a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi
@@ -92,13 +92,11 @@
 };
 
 &pwm2 {
-	/* The pwm2 pins are used by atmel_mxt_ts touchscreen. */
-	status = "disabled";
+	status = "okay";
 };
 
 &pwm3 {
-	/* The pwm3 pins are used by atmel_mxt_ts touchscreen. */
-	status = "disabled";
+	status = "okay";
 };
 
 &pwm4 {
diff --git a/arch/arm/boot/dts/imx7-colibri-iris.dtsi b/arch/arm/boot/dts/imx7-colibri-iris.dtsi
index e881c43dd33d..08279c00b3dc 100644
--- a/arch/arm/boot/dts/imx7-colibri-iris.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-iris.dtsi
@@ -89,10 +89,12 @@
 };
 
 &pwm2 {
+	/* The pwm2 should be disabled to enable atmel_mxt_ts touchscreen for adapter. */
 	status = "okay";
 };
 
 &pwm3 {
+	/* The pwm2 should be disabled to enable atmel_mxt_ts touchscreen for adapter . */
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 3856c3a50ccf..330592b8d25a 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -15,7 +15,7 @@
 		enable-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
 		power-supply = <&reg_module_3v3>;
 		pwms = <&pwm1 0 6666667 PWM_POLARITY_INVERTED>;
-		status = "okay";
+		status = "disabled";
 	};
 
 	m4_tcm: tcml@007f8000 {
@@ -371,7 +371,7 @@
 		adi,median-filter-size = /bits/ 8 <2>;
 		adi,averaging = /bits/ 8 <1>;
 		adi,conversion-interval = /bits/ 8 <255>;
-		status = "okay";
+		status = "disabled";
 	};
 
 	pmic@33 {
@@ -462,7 +462,7 @@
                 interrupt-parent = <&gpio2>;
                 interrupts = <15 IRQ_TYPE_EDGE_FALLING>;        /* SODIMM_107, INT */
                 reset-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;     /* SODIMM_106, RST */
-                status = "okay";
+                status = "disabled";
         };
 
 
@@ -486,7 +486,7 @@
 	pinctrl-0 = <&pinctrl_lcdif_dat
 		     &pinctrl_lcdif_ctrl>;
 	display = <&display0>;
-	status = "okay";
+	status = "disabled";
 
 	display0: lcd-display {
 		bits-per-pixel = <16>;
diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts b/arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts
index c02276cd4550..bc51c11be224 100644
--- a/arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts
+++ b/arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts
@@ -15,6 +15,16 @@
 		     "fsl,imx7d";
 };
 
+&pwm2 {
+	/* The pwm2 should be disabled to enable atmel_mxt_ts touchscreen. */
+	status = "okay";
+};
+
+&pwm3 {
+	/* The pwm3 should be disabled to enable atmel_mxt_ts touchscreen. */
+	status = "okay";
+};
+
 &usbotg2 {
 	vbus-supply = <&reg_usbh_vbus>;
 	status = "okay";
diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
index 1dbd16a2a6c9..14dc125fe820 100644
--- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
@@ -60,23 +60,3 @@
 &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 7383572d5b10..a5a993b691e6 100644
--- a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
@@ -14,7 +14,6 @@
 		     "fsl,imx7d";
 };
 
-
 /*
  * The PCAP uses SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm2, pwm3.
  * So if you enable following PCAP controller, disable pwm2/pwm3 first.
@@ -27,14 +26,6 @@
 	status = "disabled";
 };
 
-&pwm2 {
-	status = "okay";
-};
-
-&pwm3 {
-	status = "okay";
-};
-
 &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 ec1fe0676e2e..d4b0dafd74a0 100644
--- a/arch/arm/boot/dts/imx7d-colibri-iris.dts
+++ b/arch/arm/boot/dts/imx7d-colibri-iris.dts
@@ -15,20 +15,16 @@
 		     "fsl,imx7d";
 };
 
+/*
+ * The PCAP uses SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm2, pwm3.
+ * So if you enable following PCAP controller, disable pwm2/pwm3 first.
+ */
 &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";
+	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 = "disabled";
 };
 
 &usbotg2 {
diff --git a/arch/arm/boot/dts/imx7d-colibri.dtsi b/arch/arm/boot/dts/imx7d-colibri.dtsi
index 40e6d23c88f9..9b6866703bca 100644
--- a/arch/arm/boot/dts/imx7d-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7d-colibri.dtsi
@@ -22,10 +22,26 @@
 	};
 };
 
+&ad7879_ts {
+	status = "okay";
+};
+
+&atmel_mxt_ts {
+	status = "okay";
+};
+
+&backlight {
+	status = "okay";
+};
+
 &gpmi {
 	status = "okay";
 };
 
+&lcdif {
+	status = "okay";
+};
+
 &usbotg2 {
 	dr_mode = "host";
 };
diff --git a/arch/arm/boot/dts/imx7s-colibri.dtsi b/arch/arm/boot/dts/imx7s-colibri.dtsi
index c57728525b7f..e6c80d3ae29c 100644
--- a/arch/arm/boot/dts/imx7s-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7s-colibri.dtsi
@@ -21,6 +21,22 @@
 	};
 };
 
+&ad7879_ts {
+	status = "okay";
+};
+
+&atmel_mxt_ts {
+	status = "okay";
+};
+
+&backlight {
+	status = "okay";
+};
+
 &gpmi {
 	status = "okay";
 };
+
+&lcdif {
+	status = "okay";
+};