From 7b0aa892142c64ab2c12cdccfc17e8dd2f8d8b4d Mon Sep 17 00:00:00 2001
From: Wyon Bi <bivvy.bi@rock-chips.com>
Date: Thu, 3 Jan 2019 18:52:31 +0800
Subject: [PATCH] ARM: dts: rockchip: rk3126-bnd-m88-emmc: Update display nodes

Change-Id: Ib465fea01ba83df0b8c6f9d4b39c3de6cae671fe
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
---
 arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts | 62 ++++++++++++-----------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts b/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts
index b5c06f8d0316..a568177de348 100644
--- a/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts
+++ b/arch/arm/boot/dts/rk3126-bnd-m88-emmc.dts
@@ -74,27 +74,24 @@
 		default-brightness-level = <128>;
 	};
 
-	lvds-panel {
+	panel {
 		compatible = "simple-panel";
+		backlight = <&backlight>;
 		power-supply = <&ldo6>;
 		power-invert;
-		backlight = <&backlight>;
-
-		bus-format = <MEDIA_BUS_FMT_RGB666_1X18>;
-		rockchip,data-width = <18>;
-		rockchip,output = "rgb";
-		width-mm = <153>;
-		height-mm = <85>;
-		status = "okay";
-
 		enable-delay-ms = <120>;
 		disable-delay-ms = <20>;
 		unprepare-delay-ms = <20>;
+		bus-format = <MEDIA_BUS_FMT_RGB666_1X18>;
+
+		width-mm = <153>;
+		height-mm = <85>;
 
 		display-timings {
 			native-mode = <&timing0>;
+
 			timing0: timing0 {
-				clock-frequency = <54620160>; // 64fps //
+				clock-frequency = <51200000>;
 				hactive = <1024>;
 				vactive = <600>;
 				hback-porch = <100>;
@@ -111,8 +108,8 @@
 		};
 
 		port {
-			panel_in_lvds: endpoint {
-				remote-endpoint = <&lvds_out_panel>;
+			panel_in_rgb: endpoint {
+				remote-endpoint = <&rgb_out_panel>;
 			};
 		};
 	};
@@ -482,12 +479,9 @@
 
 &pinctrl {
 	lcdc {
-		lcdc_lcdc: lcdc-lcdc {
+		lcdc_rgb_pins: lcdc-rgb-pins {
 			rockchip,pins =
-				/* depend on the hardware */
 				<2 RK_PB0 1 &pcfg_pull_none>, /* DCLK */
-				/* <2 RK_PB1 1 &pcfg_pull_none>, /* HSYNC */
-				/* <2 RK_PB2 1 &pcfg_pull_none>, /* VSYNC */
 				<2 RK_PB3 1 &pcfg_pull_none>, /* DEN */
 				<2 RK_PB4 1 &pcfg_pull_none>, /* DATA10 */
 				<2 RK_PB5 1 &pcfg_pull_none>, /* DATA11 */
@@ -497,12 +491,20 @@
 				<2 RK_PC1 1 &pcfg_pull_none>, /* DATA15 */
 				<2 RK_PC2 1 &pcfg_pull_none>, /* DATA16 */
 				<2 RK_PC3 1 &pcfg_pull_none>; /* DATA17 */
-				/* <2 RK_PC4 1 &pcfg_pull_none>, /* DATA18 */
-				/* <2 RK_PC5 1 &pcfg_pull_none>, /* DATA19 */
-				/* <2 RK_PC6 1 &pcfg_pull_none>, /* DATA20 */
-				/* <2 RK_PC7 1 &pcfg_pull_none>, /* DATA21 */
-				/* <2 RK_PD0 1 &pcfg_pull_none>, /* DATA22 */
-				/* <2 RK_PD1 1 &pcfg_pull_none>; /* DATA23 */
+		};
+
+		lcdc_sleep_pins: lcdc-sleep-pins {
+			rockchip,pins =
+				<2 RK_PB0 0 &pcfg_pull_none>, /* DCLK */
+				<2 RK_PB3 0 &pcfg_pull_none>, /* DEN */
+				<2 RK_PB4 0 &pcfg_pull_none>, /* DATA10 */
+				<2 RK_PB5 0 &pcfg_pull_none>, /* DATA11 */
+				<2 RK_PB6 0 &pcfg_pull_none>, /* DATA12 */
+				<2 RK_PB7 0 &pcfg_pull_none>, /* DATA13 */
+				<2 RK_PC0 0 &pcfg_pull_none>, /* DATA14 */
+				<2 RK_PC1 0 &pcfg_pull_none>, /* DATA15 */
+				<2 RK_PC2 0 &pcfg_pull_none>, /* DATA16 */
+				<2 RK_PC3 0 &pcfg_pull_none>; /* DATA17 */
 		};
 	};
 
@@ -559,22 +561,24 @@
 	status = "okay";
 };
 
-&lvds {
+&rgb {
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&lcdc_rgb_pins>;
+	pinctrl-1 = <&lcdc_sleep_pins>;
 	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&lcdc_lcdc>;
+
 	ports {
 		port@1 {
 			reg = <1>;
 
-			lvds_out_panel: endpoint {
-				remote-endpoint = <&panel_in_lvds>;
+			rgb_out_panel: endpoint {
+				remote-endpoint = <&panel_in_rgb>;
 			};
 		};
 	};
 };
 
-&route_lvds {
+&route_rgb {
 	status = "okay";
 };