patch: kernel: rk35xx-vendor-6.1: adakta-smarc: update display

bmx666 · Dec 17, 2024 · d4af9ce · d4af9ce
1 parent a1fa45d
commit d4af9ce
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 83 deletions.
diff --git a/patch/kernel/rk35xx-vendor-6.1/dt/rk3568-adakta-smarc-base-display.dtsi b/patch/kernel/rk35xx-vendor-6.1/dt/rk3568-adakta-smarc-base-display.dtsi
@@ -4,6 +4,7 @@
  *
  */
 
+#include <dt-bindings/display/drm_mipi_dsi.h>
 #include <dt-bindings/display/media-bus-format.h>
 
 / {
@@ -80,7 +81,7 @@
 		default-brightness-level = <200>;
 	};
 
-	lvds1_backlight: lvds0-backlight {
+	mipi_dsi1_backlight: mipi-dsi1-backlight {
 		compatible = "pwm-backlight";
 		brightness-levels = <
 			  0  20  20  21  21  22  22  23
@@ -121,7 +122,7 @@
 
 	vcc3v3_lvds0_en: vcc3v3-lvds0-en {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3_lvds1_en";
+		regulator-name = "vcc3v3_lvds0_en";
 		regulator-boot-on;
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -136,15 +137,15 @@
 		};      
 	};
 
-	vcc3v3_lvds1_en: vcc3v3-lvds1-en {
+	vcc3v3_mipi_dsi1_en: vcc3v3-mipi-dsi1-en {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3_lvds1_en";
+		regulator-name = "vcc3v3_mipi_dsi1_en";
 		regulator-boot-on;
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
 		enable-active-high;
 		pinctrl-names = "default";
-		pinctrl-0 = <&lvds1_vdd_en>;
+		pinctrl-0 = <&mipi_dsi1_vdd_en>;
 		gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vcc3v3_sys>;
 
@@ -197,51 +198,6 @@
 			};
 		};
 	};
-
-	panel-lvds1 {
-		compatible = "simple-panel";
-		backlight = <&lvds1_backlight>;
-		power-supply = <&vcc3v3_lvds1_en>;
-		enable-delay-ms = <20>;
-		prepare-delay-ms = <20>;
-		unprepare-delay-ms = <20>;
-		disable-delay-ms = <20>;
-		bus-format = <MEDIA_BUS_FMT_RGB888_1X7X4_SPWG>;
-		width-mm = <304>;
-		height-mm = <228>;
-
-		display-timings {
-			native-mode = <&lvds1_g150xtn03_timing>;
-
-			lvds1_g150xtn03_timing: lvds1-g150xtn03-timing {
-				clock-frequency = <65000000>;
-				hactive = <1024>;
-				vactive = <768>;
-				hfront-porch = <24>;
-				hsync-len = <136>;
-				hback-porch = <160>;
-				vfront-porch = <3>;
-				vsync-len = <6>;
-				vback-porch = <29>;
-				hsync-active = <0>;
-				vsync-active = <0>;
-				de-active = <0>;
-				pixelclk-active = <0>;
-			};
-		};
-
-		ports {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			port@0 {
-				reg = <0>;
-				panel_in_lvds1: endpoint {
-					remote-endpoint = <&lvds1_out_panel>;
-				};
-			};
-		};
-	};
 };
 
 &pinctrl {
@@ -251,22 +207,28 @@
 		};
 	};
 
-	lvds {
+	lvds0 {
 		lvds0_vdd_en: lvds0-vdd-en {
 			rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
 		lvds0_backlight_en: lvds0-backlight-en {
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
+	};
 
-		lvds1_vdd_en: lvds1-vdd-en {
+	mipi-dsi {
+		mipi_dsi1_vdd_en: mipi-dsi1-vdd-en {
 			rockchip,pins = <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 
-		lvds1_backlight_en: lvds1-backlight-en {
+		mipi_dsi1_reset: mipi-dsi1-reset {
 			rockchip,pins = <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
+
+		mipi_dsi1_int: mipi-dsi1-int {
+			rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+		};
 	};
 };
 
@@ -276,6 +238,46 @@
 
 &dsi1 {
 	status = "disabled";
+
+	panel-dsi1 {
+		compatible = "feixin,k101-im2byl02", "ilitek,ili9881c";
+		reg = <0>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&mipi_dsi1_reset>;
+
+		power-supply = <&vcc3v3_mipi_dsi1_en>;
+		backlight = <&mipi_dsi1_backlight>;
+		reset-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
+
+		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+				panel_in_dsi1: endpoint {
+					remote-endpoint = <&dsi1_out_panel>;
+				};
+			};
+		};
+	};
+
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			dsi1_out_panel: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&panel_in_dsi1>;
+			};
+		};
+	};
 };
 
 &edp {
@@ -335,23 +337,10 @@
 
 &lvds1 {
 	status = "disabled";
-
-	ports {
-		port@1 {
-			reg = <1>;
-
-			lvds1_out_panel: endpoint {
-				remote-endpoint = <&panel_in_lvds1>;
-			};
-		};
-	};
 };
 
-&lvds1_backlight {
+&mipi_dsi1_backlight {
 	pwms = <&pwm0 0 10000 0>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&lvds1_backlight_en>;
-	enable-gpios = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
 	status = "disabled";
 };
 

diff --git a/patch/kernel/rk35xx-vendor-6.1/overlay-dtbo.patch b/patch/kernel/rk35xx-vendor-6.1/overlay-dtbo.patch
@@ -32,8 +32,8 @@ index f3fc426ec76f..1b4251fd76bb 100644
 +	adakta-smarc-display-hdmi-vp1.dtbo \
 +	adakta-smarc-display-lvds0-vp1.dtbo \
 +	adakta-smarc-display-lvds0-vp2.dtbo \
-+	adakta-smarc-display-lvds1-vp1.dtbo \
-+	adakta-smarc-display-lvds1-vp2.dtbo
++	adakta-smarc-display-dsi1-vp0.dtbo \
++	adakta-smarc-display-dsi1-vp1.dtbo
 +
  # SPDX-License-Identifier: GPL-2.0
  dtbo-$(CONFIG_ARCH_ROCKCHIP) += \

diff --git a/...verlay/adakta-smarc-display-lvds1-vp1.dts → ...overlay/adakta-smarc-display-dsi1-vp0.dts b/...verlay/adakta-smarc-display-lvds1-vp1.dts → ...overlay/adakta-smarc-display-dsi1-vp0.dts
@@ -3,39 +3,39 @@
 
 / {
 	metadata {
-		title = "Enable LVDS1 via VP1";
+		title = "Enable MIPI DSI1 via VP2";
 		compatible = "adakta,adakta-smarc-rk3568";
 		category = "display";
-		description = "Enable LVDS1 via VP1";
+		description = "Enable MIPI DSI1 via VP2";
 	};
 
 	fragment@0 {
-		target = <&lvds1>;
+		target = <&dsi1>;
 
 		__overlay__ {
 			status = "okay";
 		};
 	};
 
 	fragment@1 {
-		target = <&lvds1_in_vp1>;
+		target = <&dsi1_in_vp0>;
 
 		__overlay__ {
 			status = "okay";
 		};
 	};
 
 	fragment@2 {
-		target = <&route_lvds>;
+		target = <&route_dsi1>;
 
 		__overlay__ {
 			status = "okay";
-			connect = <&vp1_out_lvds>;
+			connect = <&vp0_out_dsi1>;
 		};
 	};
 
 	fragment@3 {
-		target = <&lvds1_backlight>;
+		target = <&mipi_dsi1_backlight>;
 
 		__overlay__ {
 			status = "okay";

diff --git a/...verlay/adakta-smarc-display-lvds1-vp2.dts → ...overlay/adakta-smarc-display-dsi1-vp1.dts b/...verlay/adakta-smarc-display-lvds1-vp2.dts → ...overlay/adakta-smarc-display-dsi1-vp1.dts
@@ -3,39 +3,39 @@
 
 / {
 	metadata {
-		title = "Enable LVDS1 via VP2";
+		title = "Enable MIPI DSI1 via VP1";
 		compatible = "adakta,adakta-smarc-rk3568";
 		category = "display";
-		description = "Enable LVDS1 via VP2";
+		description = "Enable MIPI DSI1 via VP1";
 	};
 
 	fragment@0 {
-		target = <&lvds1>;
+		target = <&dsi1>;
 
 		__overlay__ {
 			status = "okay";
 		};
 	};
 
 	fragment@1 {
-		target = <&lvds1_in_vp2>;
+		target = <&dsi1_in_vp1>;
 
 		__overlay__ {
 			status = "okay";
 		};
 	};
 
 	fragment@2 {
-		target = <&route_lvds>;
+		target = <&route_dsi1>;
 
 		__overlay__ {
 			status = "okay";
-			connect = <&vp2_out_lvds>;
+			connect = <&vp1_out_dsi1>;
 		};
 	};
 
 	fragment@3 {
-		target = <&lvds1_backlight>;
+		target = <&mipi_dsi1_backlight>;
 
 		__overlay__ {
 			status = "okay";