From 63dd03ea174e6bedce606434c93b1164a643f7a9 Mon Sep 17 00:00:00 2001
From: zwl <zwl@rockchips.com>
Date: Thu, 31 Jul 2014 20:02:14 +0800
Subject: [PATCH] rk312x dts: different lcdc dt node config for rk3126 and
 rk3128

---
 arch/arm/boot/dts/rk3126-sdk.dts  | 13 ++++++++++++
 arch/arm/boot/dts/rk3128-sdk.dts  | 13 ++++++++++++
 arch/arm/boot/dts/rk312x-sdk.dtsi | 33 ++++++++++---------------------
 3 files changed, 36 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 arch/arm/boot/dts/rk3126-sdk.dts
 mode change 100644 => 100755 arch/arm/boot/dts/rk3128-sdk.dts
 mode change 100644 => 100755 arch/arm/boot/dts/rk312x-sdk.dtsi

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
old mode 100644
new mode 100755
index d295a8090e3e..5d245b5a9a62
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -3,3 +3,16 @@
 / {
 	 compatible = "rockchip,rk3126";
 };
+
+&lcdc {
+	status = "okay";
+
+	power_ctr: power_ctr {
+		rockchip,debug = <0>;
+		lcd_en: lcd_en {
+			rockchip,power_type = <GPIO>;
+			gpios = <&gpio1 GPIO_B3 GPIO_ACTIVE_HIGH>;
+			rockchip,delay = <10>;
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
old mode 100644
new mode 100755
index 19253aed3f10..79ca644111f5
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -3,3 +3,16 @@
 / {
 	 compatible = "rockchip,rk3128";
 };
+
+&lcdc {
+	status = "okay";
+
+	power_ctr: power_ctr {
+		rockchip,debug = <0>;
+		lcd_en: lcd_en {
+			rockchip,power_type = <GPIO>;
+			gpios = <&gpio0 GPIO_D1 GPIO_ACTIVE_HIGH>;
+			rockchip,delay = <10>;
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
old mode 100644
new mode 100755
index 5ddcf80c1b7f..b744b8e82410
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -143,31 +143,18 @@
 	};
 };
 
-	&fb {
-		rockchip,disp-mode = <ONE_DUAL>;
-		rockchip,uboot-logo-on = <0>;
-	};
-
-	&rk_screen {
-		display-timings = <&disp_timings>;
-	};
-
-	&lcdc {
-		status = "okay";
+&fb {
+	rockchip,disp-mode = <ONE_DUAL>;
+	rockchip,uboot-logo-on = <0>;
+};
 
-		power_ctr: power_ctr {
-			rockchip,debug = <0>;
-			lcd_en: lcd_en {
-				rockchip,power_type = <GPIO>;
-				gpios = <&gpio1 GPIO_B3 GPIO_ACTIVE_HIGH>;
-				rockchip,delay = <10>;
-			};
-		};
-	};
+&rk_screen {
+	display-timings = <&disp_timings>;
+};
 
-	&hdmi {
-		status = "okay";
-	};
+&hdmi {
+	status = "okay";
+};
 
 /include/ "rk818.dtsi"
 &rk818 {
-- 
2.34.1