From 6a83e7f14032eced131bdee261c8adafeb252fa8 Mon Sep 17 00:00:00 2001
From: Jianqun Xu <jay.xu@rock-chips.com>
Date: Tue, 11 Apr 2017 10:50:56 +0800
Subject: [PATCH] arm: dts: rk3288-evb: modify panel to edp_panel

Change-Id: I5a62c8fa933e9852d88646411d13e67075d63b02
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
 arch/arm/boot/dts/rk3288-android.dtsi    | 2 +-
 arch/arm/boot/dts/rk3288-evb-act8846.dts | 8 ++++----
 arch/arm/boot/dts/rk3288-evb-rk808.dts   | 9 +++++----
 arch/arm/boot/dts/rk3288-evb-rk818.dts   | 8 ++++----
 arch/arm/boot/dts/rk3288-evb.dtsi        | 4 +++-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/arch/arm/boot/dts/rk3288-android.dtsi b/arch/arm/boot/dts/rk3288-android.dtsi
index d58eaa55e535..fbaee75d1e10 100644
--- a/arch/arm/boot/dts/rk3288-android.dtsi
+++ b/arch/arm/boot/dts/rk3288-android.dtsi
@@ -227,7 +227,7 @@
 	};
 };
 
-&panel {
+&edp_panel {
 	backlight = <&backlight>;
 };
 
diff --git a/arch/arm/boot/dts/rk3288-evb-act8846.dts b/arch/arm/boot/dts/rk3288-evb-act8846.dts
index ec2b3219bf60..5817289604ab 100644
--- a/arch/arm/boot/dts/rk3288-evb-act8846.dts
+++ b/arch/arm/boot/dts/rk3288-evb-act8846.dts
@@ -246,6 +246,10 @@
 	};
 };
 
+&edp_panel {
+	power-supply = <&vcc_lcd>;
+};
+
 &i2c1 {
 	status = "okay";
 	clock-frequency = <400000>;
@@ -272,10 +276,6 @@
 	power-supply = <&vcc_lcd>;
 };
 
-&panel {
-	power-supply = <&vcc_lcd>;
-};
-
 &pinctrl {
 	lcd {
 		lcd_en: lcd-en  {
diff --git a/arch/arm/boot/dts/rk3288-evb-rk808.dts b/arch/arm/boot/dts/rk3288-evb-rk808.dts
index 79838d81ee17..f1347219b906 100644
--- a/arch/arm/boot/dts/rk3288-evb-rk808.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk808.dts
@@ -40,6 +40,7 @@
 
 /dts-v1/;
 #include "rk3288-evb.dtsi"
+#include "rk3288-android.dtsi"
 
 / {
 	compatible = "rockchip,rk3288-evb-rk808", "rockchip,rk3288";
@@ -262,6 +263,10 @@
 	};
 };
 
+&edp_panel {
+	power-supply = <&vcc_lcd>;
+};
+
 &gmac {
 	phy-supply = <&vcc_phy>;
 	phy-mode = "rgmii";
@@ -281,7 +286,3 @@
 &lvds_panel {
 	power-supply = <&vcc_lcd>;
 };
-
-&panel {
-	power-supply = <&vcc_lcd>;
-};
diff --git a/arch/arm/boot/dts/rk3288-evb-rk818.dts b/arch/arm/boot/dts/rk3288-evb-rk818.dts
index 3b7ae6ee7393..b282131c696f 100644
--- a/arch/arm/boot/dts/rk3288-evb-rk818.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk818.dts
@@ -83,6 +83,10 @@
 	cpu0-supply = <&vdd_cpu>;
 };
 
+&edp_panel {
+	power-supply = <&vcc_lcd>;
+};
+
 &gpu {
 	status = "okay";
 	mali-supply = <&vdd_gpu>;
@@ -323,10 +327,6 @@
 	power-supply = <&vcc_lcd>;
 };
 
-&panel {
-	power-supply = <&vcc_lcd>;
-};
-
 &pinctrl {
 	lcd {
 		lcd_en: lcd-en  {
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 9cd8a9d6da56..948227e452b4 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -49,10 +49,12 @@
 		bootargs = "earlycon=uart8250,mmio32,0xff690000 swiotlb=1";
 	};
 
-	panel: panel {
+	edp_panel: edp-panel {
 		compatible ="lg,lp079qx1-sp0v", "simple-panel";
 		enable-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
 		pinctrl-0 = <&lcd_cs>;
+		status = "disabled";
+
 		ports {
 			panel_in: port {
 				panel_in_edp: endpoint {
-- 
2.34.1