ARM64: dts: colibri-imx8x: clean-up panel stuff

Make panel definition generic and default to VESA VGA display timings.

For fsl-imx8qxp-colibri-lvds-single-eval-v3.dts now use
logictechno,lt170410-2whc compatible which is the panel inside our
Capacitive Touch Display 10.1" LVDS.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

4 files changed, 72 insertions, 85 deletions

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-aster.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-aster.dts
index 70af7cb58947..c615dc101801 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-aster.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri-aster.dts
@@ -12,6 +12,10 @@
 	compatible = "toradex,colibri_imx8qxp-aster", \
 			"toradex,colibri-imx8qxp", "fsl,imx8qxp";
 
+	display-subsystem {
+		status = "okay";
+	};
+
 	extcon_usbc_det: usbc_det {
 		compatible = "linux,extcon-usb-gpio";
 		debounce = <25>;
@@ -34,18 +38,6 @@
 		};
 	};
 
-	panel {
-		compatible = "edt,et070080dh6";
-		backlight = <&backlight>;
-		enable-gpios = <&gpio4 19 GPIO_ACTIVE_HIGH>;
-
-		port {
-			lcd_panel_in: endpoint {
-				remote-endpoint = <&lcd_display_out>;
-			};
-		};
-	};
-
 	regulators {
 		reg_3v3: regulator-3v3 {
 			compatible = "regulator-fixed";
@@ -74,30 +66,10 @@
 	};
 };
 
-&adma_lcdif {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_lcdif>;
-	bus-width = <18>;
-	status = "okay";
-
-	port@0 {
-		lcd_display_out: lcdif-endpoint {
-			remote-endpoint = <&lcd_panel_in>;
-		};
-	};
-};
-
 &atmel_mxt_ts {
 	status = "okay";
 };
 
-&backlight {
-	brightness-levels = <0 45 63 88 119 158 203 255>;
-	default-brightness-level = <4>;
-	pwms = <&pwm_adma_lcdif 0 6666667 PWM_POLARITY_INVERTED>;
-	status = "okay";
-};
-
 /* Colibri I2C */
 &i2c1 {
 	status = "okay";
@@ -127,6 +99,11 @@
 	};
 };
 
+/* Colibri PWM_A */
+&pwm_adma_lcdif {
+	status = "okay";
+};
+
 /* Colibri PWM_B */
 &pwm0 {
 	status = "okay";
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 57c11cc20cc6..cc8ac8c88022 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
@@ -42,37 +42,6 @@
 		};
 	};
 
-	panel {
-		compatible = "panel-dpi";
-		backlight = <&backlight>;
-		enable-gpios = <&gpio4 19 GPIO_ACTIVE_HIGH>;
-		power-supply = <&reg_3v3>;
-
-		width-mm = <154>;
-		height-mm = <86>;
-
-		data-mapping = "bgr666";
-
-		panel-timing {
-			clock-frequency = <33300000>;
-			hactive = <800>;
-			hback-porch = <46>;
-			hfront-porch = <210>;
-			hsync-len = <20>;
-			vactive = <480>;
-			vback-porch = <23>;
-			vfront-porch = <22>;
-			vsync-len = <10>;
-			pixelclk-active = <1>;
-		};
-
-		port {
-			lcd_panel_in: endpoint {
-				remote-endpoint = <&lcd_display_out>;
-			};
-		};
-	};
-
 	regulators {
 		reg_3v3: regulator-3v3 {
 			compatible = "regulator-fixed";
@@ -106,27 +75,6 @@
 	status = "okay";
 };
 
-/* Colibri Parallel RGB */
-&adma_lcdif {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_lcdif>;
-	bus-width = <18>;
-	status = "okay";
-
-	port@0 {
-		lcd_display_out: lcdif-endpoint {
-			remote-endpoint = <&lcd_panel_in>;
-		};
-	};
-};
-
-&backlight {
-	brightness-levels = <0 45 63 88 119 158 203 255>;
-	default-brightness-level = <4>;
-	pwms = <&pwm_adma_lcdif 0 6666667 PWM_POLARITY_INVERTED>;
-	status = "okay";
-};
-
 &dpu1 {
 	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 c2f0f36979b9..980611632b47 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
@@ -14,7 +14,7 @@
 	compatible = "toradex,colibri-imx8qxp-lvds-single-eval-v3", "toradex,colibri-imx8qxp", "fsl,imx8qxp";
 
 	lvds1_panel {
-		compatible = "toradex,captouch-101-lvds";
+		compatible = "logictechno,lt170410-2whc";
 		backlight = <&backlight>;
 
 		port {
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi
index 564bf90583cb..3c421288df66 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi
@@ -23,6 +23,47 @@
 		status = "disabled";
 	};
 
+	panel: panel {
+		/*
+		 * edt,et057090dhu: EDT 5.7" LCD TFT
+		 * edt,et070080dh6: EDT 7.0" LCD TFT
+		 * logictechno,lt161010-2nhc: Cap. Touch Display 7" Parallel
+		 * logictechno,lt161010-2nhr: Res. Touch Display 7" Parallel
+		 * logictechno,lt170410-2whc: Cap. Touch Display 10.1" LVDS
+		 * tpk,f07a-0102: Capacitive Multi-Touch Display Fusion 7"
+		 * tpk,f10a-0102: Capacitive Multi-Touch Display Fusion 10"
+		 */
+		compatible = "panel-dpi";
+		backlight = <&backlight>;
+		enable-gpios = <&gpio4 19 GPIO_ACTIVE_HIGH>;
+		power-supply = <&reg_3v3>;
+
+		width-mm = <217>;
+		height-mm = <136>;
+
+		data-mapping = "bgr666";
+
+		panel-timing {
+			/* Default VESA VGA display timings */
+			clock-frequency = <25175000>;
+			hactive = <640>;
+			hback-porch = <48>;
+			hfront-porch = <16>;
+			hsync-len = <96>;
+			vactive = <480>;
+			vback-porch = <31>;
+			vfront-porch = <11>;
+			vsync-len = <2>;
+			pixelclk-active = <0>;
+		};
+
+		port {
+			lcd_panel_in: endpoint {
+				remote-endpoint = <&lcd_display_out>;
+			};
+		};
+	};
+
 	regulators {
 		compatible = "simple-bus";
 		#address-cells = <1>;
@@ -84,6 +125,27 @@
 	vref-supply = <&reg_vref_1v8>;
 };
 
+/* Colibri Parallel RGB */
+&adma_lcdif {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_lcdif>;
+	bus-width = <18>;
+	status = "okay";
+
+	port@0 {
+		lcd_display_out: lcdif-endpoint {
+			remote-endpoint = <&lcd_panel_in>;
+		};
+	};
+};
+
+&backlight {
+	brightness-levels = <0 45 63 88 119 158 203 255>;
+	default-brightness-level = <4>;
+	pwms = <&pwm_adma_lcdif 0 6666667 PWM_POLARITY_INVERTED>;
+	status = "okay";
+};
+
 /* Colibri Ethernet */
 &fec1 {
 	pinctrl-names = "default", "sleep";