diff --git a/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts b/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts
index 174a9a828427..ec68a65edd0f 100644
--- a/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts
@@ -77,7 +77,6 @@
 		compatible = "adi,adv7125";
 		psave-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>;
 		vdd-supply = <&vcc_lcd>;
-		rockchip,output = "rgb";
 		#address-cells = <1>;
 		#size-cells = <0>;
 
@@ -87,15 +86,17 @@
 
 			port@0 {
 				reg = <0>;
-				adv7125_in: endpoint {
-					remote-endpoint = <&rgb_out>;
+
+				adv7125_in_rgb: endpoint {
+					remote-endpoint = <&rgb_out_adv7125>;
 				};
 			};
 
 			port@1 {
 				reg = <1>;
-				adv7125_out: endpoint {
-					remote-endpoint = <&vga_in>;
+
+				adv7125_out_vga: endpoint {
+					remote-endpoint = <&vga_in_adv7125>;
 				};
 			};
 		};
@@ -105,9 +106,9 @@
 		compatible = "vga-connector";
 		ddc-i2c-bus = <&i2c2>;
 
-		 port {
-			vga_in: endpoint {
-				remote-endpoint = <&adv7125_out>;
+		port {
+			vga_in_adv7125: endpoint {
+				remote-endpoint = <&adv7125_out_vga>;
 			};
 		};
 	};
@@ -264,27 +265,33 @@
 	status = "okay";
 };
 
-&route_lvds {
-	status = "disabled";
-};
-
-&lvds {
+&rgb {
 	status = "okay";
 
 	ports {
 		port@1 {
 			reg = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 
-			rgb_out: endpoint@0 {
-				reg = <0>;
-				remote-endpoint = <&adv7125_in>;
+			rgb_out_adv7125: endpoint {
+				remote-endpoint = <&adv7125_in_rgb>;
 			};
 		};
 	};
 };
 
+&rgb_in_vopl {
+	status = "okay";
+};
+
+&rgb_in_vopb {
+	status = "disabled";
+};
+
+&route_rgb {
+	connect = <&vopl_out_rgb>;
+	status = "disabled";
+};
+
 &hevc_service {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/rk3288-popmetal-android.dts b/arch/arm/boot/dts/rk3288-popmetal-android.dts
index fbb65b71bffb..e05b455f3ceb 100644
--- a/arch/arm/boot/dts/rk3288-popmetal-android.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal-android.dts
@@ -49,6 +49,40 @@
 	model = "PopMetal-RK3288";
 	compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288";
 
+	panel {
+		compatible ="simple-panel";
+		power-supply = <&vcc_lcd>;
+		enable-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>;
+		enable-delay-ms = <10>;
+		ddc-i2c-bus = <&i2c2>;
+
+		display-timings {
+			native-mode = <&timing0>;
+
+			timing0: timing0 {
+				clock-frequency = <74250000>;
+				hactive = <1280>;
+				vactive = <720>;
+				hback-porch = <220>;
+				hfront-porch = <120>;
+				vback-porch = <20>;
+				vfront-porch = <5>;
+				hsync-len = <40>;
+				vsync-len = <5>;
+				hsync-active = <0>;
+				vsync-active = <0>;
+				de-active = <0>;
+				pixelclk-active = <0>;
+			};
+		};
+
+		port {
+			panel_in_rgb: endpoint {
+				remote-endpoint = <&rgb_out_panel>;
+			};
+		};
+	};
+
 	sdio_pwrseq: sdio-pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		clocks = <&rk808 1>;
@@ -225,43 +259,33 @@
 	status = "okay";
 };
 
-&route_lvds {
+&rgb {
 	status = "okay";
-};
 
-&lvds {
-	status = "okay";
-};
+	ports {
+		port@1 {
+			reg = <1>;
 
-&lvds_panel {
-	status = "okay";
-	compatible ="simple-panel";
-	enable-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>;
-	enable-delay-ms = <10>;
-	power-supply = <&vcc_lcd>;
-	ddc-i2c-bus = <&i2c2>;
-	rockchip,output = "rgb";
-
-	display-timings {
-		native-mode = <&timing0>;
-		timing0: timing0 {
-			clock-frequency = <74250000>;
-			hactive = <1280>;
-			vactive = <720>;
-			hback-porch = <220>;
-			hfront-porch = <120>;
-			vback-porch = <20>;
-			vfront-porch = <5>;
-			hsync-len = <40>;
-			vsync-len = <5>;
-			hsync-active = <0>;
-			vsync-active = <0>;
-			de-active = <0>;
-			pixelclk-active = <0>;
+			rgb_out_panel: endpoint {
+				remote-endpoint = <&panel_in_rgb>;
+			};
 		};
 	};
 };
 
+&rgb_in_vopl {
+	status = "okay";
+};
+
+&rgb_in_vopb {
+	status = "disabled";
+};
+
+&route_rgb {
+	connect = <&vopl_out_rgb>;
+	status = "okay";
+};
+
 &hevc_service {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index 19f00da2981e..0ad61dbbed74 100644
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -152,7 +152,6 @@
 		compatible = "adi,adv7125";
 		psave-gpios = <&gpio7 21 GPIO_ACTIVE_HIGH>;
 		vdd-supply = <&vcc_lcd>;
-		rockchip,output = "rgb";
 		#address-cells = <1>;
 		#size-cells = <0>;
 
@@ -162,15 +161,17 @@
 
 			port@0 {
 				reg = <0>;
-				adv7125_in: endpoint {
-					remote-endpoint = <&rgb_out>;
+
+				adv7125_in_rgb: endpoint {
+					remote-endpoint = <&rgb_out_adv7125>;
 				};
 			};
 
 			port@1 {
 				reg = <1>;
-				adv7125_out: endpoint {
-					remote-endpoint = <&vga_in>;
+
+				adv7125_out_vga: endpoint {
+					remote-endpoint = <&vga_in_adv7125>;
 				};
 			};
 		};
@@ -180,9 +181,9 @@
 		compatible = "vga-connector";
 		ddc-i2c-bus = <&i2c2>;
 
-		 port {
-			vga_in: endpoint {
-				remote-endpoint = <&adv7125_out>;
+		port {
+			vga_in_adv7125: endpoint {
+				remote-endpoint = <&adv7125_out_vga>;
 			};
 		};
 	};
@@ -246,27 +247,33 @@
 	status = "okay";
 };
 
-&route_lvds {
-	status = "disabled";
-};
-
-&lvds {
+&rgb {
 	status = "okay";
 
 	ports {
 		port@1 {
 			reg = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
 
-			rgb_out: endpoint@0 {
-				reg = <0>;
-				remote-endpoint = <&adv7125_in>;
+			rgb_out_adv7125: endpoint {
+				remote-endpoint = <&adv7125_in_rgb>;
 			};
 		};
 	};
 };
 
+&rgb_in_vopl {
+	status = "okay";
+};
+
+&rgb_in_vopb {
+	status = "disabled";
+};
+
+&route_rgb {
+	connect = <&vopl_out_rgb>;
+	status = "disabled";
+};
+
 &hevc_service {
 	status = "okay";
 };