ARM: dts: colibri-imx6: disable lcd interface

The parallel RGB interface (lcd) and all related stuff turn
on in an overlay. Keep them disabled in the main devicetree.
As these subsystems are provided by module, move their definitions
into the module-level devicetree.

Related-to: ELB-3395
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

6 files changed, 21 insertions, 42 deletions

diff --git a/arch/arm/boot/dts/imx6dl-colibri-aster.dts b/arch/arm/boot/dts/imx6dl-colibri-aster.dts
index 052ca13ddd06..d77d8d399826 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-aster.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-aster.dts
@@ -69,13 +69,6 @@
 	status = "okay";
 };
 
-&backlight {
-	brightness-levels = <0 45 63 88 119 158 203 255>;
-	default-brightness-level = <4>;
-	pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>;
-	status = "okay";
-};
-
 &ecspi4 {
 	fsl,spi-num-chipselects = <2>;
 	cs-gpios = <
@@ -157,10 +150,6 @@
 	};
 };
 
-&lcd {
-	status = "okay";
-};
-
 &mxcfb1 {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
index 06f7f2d06069..764bdcf68780 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts
@@ -242,10 +242,6 @@
 	};
 };
 
-&lcd {
-	status = "okay";
-};
-
 &mxcfb1 {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 09e5740c75df..952a81fb4c25 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -79,13 +79,6 @@
 	};
 };
 
-&backlight {
-	brightness-levels = <0 45 63 88 119 158 203 255>;
-	default-brightness-level = <4>;
-	pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>;
-	status = "okay";
-};
-
 /* Colibri SSP */
 &ecspi4 {
 	mcp251x0: mcp251x@0 {
@@ -157,10 +150,6 @@
 	};
 };
 
-&lcd {
-	status = "okay";
-};
-
 &mxcfb1 {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts b/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts
index bf829c14ca81..09efa2eb52ef 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts
@@ -37,11 +37,16 @@
 	};
 };
 
-&backlight {
-	brightness-levels = <0 45 63 88 119 158 203 255>;
-	default-brightness-level = <4>;
-	pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>;
+/* Colibri SSP */
+&ecspi4 {
 	status = "okay";
+
+	spidev0: spidev@0 {
+		compatible = "toradex,evalspi";
+		reg = <0>;
+		spi-max-frequency = <23000000>;
+		status = "okay";
+	};
 };
 
 /*
@@ -70,10 +75,6 @@
 	};
 };
 
-&lcd {
-	status = "okay";
-};
-
 &mxcfb1 {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris.dts b/arch/arm/boot/dts/imx6dl-colibri-iris.dts
index 45a84023e36b..ddfaceda64b7 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-iris.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-iris.dts
@@ -25,11 +25,16 @@
 	};
 };
 
-&backlight {
-	brightness-levels = <0 45 63 88 119 158 203 255>;
-	default-brightness-level = <4>;
-	pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>;
+/* Colibri SSP */
+&ecspi4 {
 	status = "okay";
+
+	spidev0: spidev@0 {
+		compatible = "toradex,evalspi";
+		reg = <0>;
+		spi-max-frequency = <23000000>;
+		status = "okay";
+	};
 };
 
 /*
@@ -58,10 +63,6 @@
 	};
 };
 
-&lcd {
-	status = "okay";
-};
-
 &mxcfb1 {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index b9a1cf409c84..9e23b94e6a5a 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -56,7 +56,10 @@
 		compatible = "pwm-backlight";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpio_bl_on>;
+		brightness-levels = <0 45 63 88 119 158 203 255>;
+		default-brightness-level = <4>;
 		enable-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>; /* Colibri BL_ON */
+		pwms = <&pwm3 0 6666667 PWM_POLARITY_INVERTED>;
 		status = "disabled";
 	};