ARM64: dts: colibri-imx8x: display-dts: Adaptions for new structure

- Remove Lontium V1.0 board settings
- Disable RGB display
- Add eval.dtsi

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>

4 files changed, 31 insertions, 52 deletions

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
index d951d4375f02..8ffffa35d120 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-dsihdmi-eval-v3.dts
@@ -4,9 +4,9 @@
  */
 
 /dts-v1/;
-//#define DSI_TO_HDMI_V10
 
 #include "fsl-imx8qxp-colibri.dtsi"
+#include "fsl-imx8qxp-colibri-eval-v3.dtsi"
 
 / {
 	model = "Toradex Colibri iMX8QXP with LT8912 MIPI-DSI 2 HDMI bridge";
@@ -14,6 +14,15 @@
 
 };
 
+/* Colibri Parallel RGB */
+&adma_lcdif {
+	status = "disabled";
+};
+
+&backlight {
+	status = "disabled";
+};
+
 /* Display Prefetch Resolve, (Tiling) */
 &dpr1_channel1 {
 	status = "okay";
@@ -51,7 +60,6 @@
 &i2c0_mipi_lvds0 {
 	status = "okay";
 
-#ifndef DSI_TO_HDMI_V10
 	/* DSI to HDMI Adapter V1.1A */
 	i2c-switch@70 {
 		compatible = "nxp,pca9540";
@@ -121,55 +129,6 @@
 			};
 		};
 	};
-#else /* DSI_TO_HDMI_V10 */
-	/* DSI to HDMI Adapter V1.0A */
-	lt8912@48 {
-		compatible = "lontium,lt8912";
-		reg = <0x48>;
-
-		port {
-			lt8912_1_in: endpoint {
-				remote-endpoint = <&mipi_dsi_bridge1_out>;
-			};
-		};
-
-		display-timings {
-			native-mode = <&timing1>;
-
-			timing0: timing0 {
-				clock-frequency = <74250000>;
-				hactive = <1280>;
-				vactive = <720>;
-				hfront-porch = <110>;
-				hsync-len = <40>;
-				hback-porch = <220>;
-				vfront-porch = <5>;
-				vsync-len = <5>;
-				vback-porch = <20>;
-				hsync-active = <0>;
-				vsync-active = <0>;
-				de-active = <0>;
-				pixelclk-active = <0>;
-			};
-
-			timing1: timing1 {
-				clock-frequency = <148500000>;
-				hactive = <1920>;
-				vactive = <1080>;
-				hfront-porch = <88>;
-				hsync-len = <44>;
-				hback-porch = <148>;
-				vfront-porch = <36>;
-				vsync-len = <5>;
-				vback-porch = <4>;
-				hsync-active = <0>;
-				vsync-active = <0>;
-				de-active = <0>;
-				pixelclk-active = <0>;
-			};
-		};
-	};
-#endif /* DSI_TO_HDMI_V10 */
 };
 
 &ldb1_phy {
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi
index 00658f075305..a1b24424a890 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-eval-v3.dtsi
@@ -17,7 +17,7 @@
 	};
 
 	display-subsystem {
-		status = "disabled";
+		status = "okay";
 	};
 
 	extcon_usbc_det: usbc_det {
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts
index 66b71c1ef4ba..f525168f150c 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-dual-eval-v3.dts
@@ -7,6 +7,7 @@
 
 #include "dt-bindings/pwm/pwm.h"
 #include "fsl-imx8qxp-colibri.dtsi"
+#include "fsl-imx8qxp-colibri-eval-v3.dtsi"
 
 / {
 	model = "Toradex Colibri iMX8QXP with dual channel lvds";
@@ -35,6 +36,15 @@
 	};
 };
 
+/* Colibri Parallel RGB */
+&adma_lcdif {
+	status = "disabled";
+};
+
+&backlight {
+	status = "disabled";
+};
+
 /* Display Prefetch Resolve, (Tiling) */
 &dpr1_channel1 {
 	status = "okay";
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
index ff85b4342cd5..2bd1e73d85c2 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-lvds-single-eval-v3.dts
@@ -7,6 +7,7 @@
 
 #include "dt-bindings/pwm/pwm.h"
 #include "fsl-imx8qxp-colibri.dtsi"
+#include "fsl-imx8qxp-colibri-eval-v3.dtsi"
 
 / {
 	model = "Toradex Colibri iMX8QXP with single channel lvds";
@@ -35,6 +36,15 @@
 	};
 };
 
+/* Colibri Parallel RGB */
+&adma_lcdif {
+	status = "disabled";
+};
+
+&backlight {
+	status = "disabled";
+};
+
 /* Display Prefetch Resolve, (Tiling) */
 &dpr1_channel1 {
 	status = "okay";