From: hjc <hjc@rock-chips.com>
Date: Mon, 17 Mar 2014 11:26:56 +0000 (+0800)
Subject: modify rk3288.dtsi rk3288-tb.dts rk3188-tb.dts
X-Git-Tag: firefly_0821_release~6044
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c762bc5310d8adce04cd889965103358b9fb743d;p=firefly-linux-kernel-4.4.55.git

modify rk3288.dtsi rk3288-tb.dts rk3188-tb.dts
---

diff --git a/arch/arm/boot/dts/rk3188-tb.dts b/arch/arm/boot/dts/rk3188-tb.dts
index 288e1cf90c50..7d8dd84d926c 100755
--- a/arch/arm/boot/dts/rk3188-tb.dts
+++ b/arch/arm/boot/dts/rk3188-tb.dts
@@ -313,13 +313,7 @@
 			rockchip,delay = <10>;
 		};
 
-                     /*   bl_en:bl_en {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>;
-                                rockchip,delay = <10>;
-                        };
-
-                        bl_ctr:bl_ctr {
+                     /*lcd_cs:lcd_cs {
                                 rockchip,power_type = <GPIO>;
                                 gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>;
                                 rockchip,delay = <10>;
diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index f04653b0931b..d437aae2ef67 100755
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -196,18 +196,19 @@
 	 display-timings = <&disp_timings>;
 };
 
-&lcdc0 {
+/*lcdc1 as PRMRY(LCD),lcdc0 as EXTEND(HDMI)*/
+&lcdc1 {
 	status = "okay";
 	power_ctr: power_ctr {
 		rockchip,debug = <0>;
-		/*lcd_en:lcd_en {
+		rockchip,mirror = <NO_MIRROR>;
+		lcd_en:lcd_en {
 			rockchip,power_type = <GPIO>;
 			gpios = <&gpio7 GPIO_A3 GPIO_ACTIVE_HIGH>;
 			rockchip,delay = <10>;
 		};
-
-			   
-		lcd_cs:lcd_cs {
+		
+		/*lcd_cs:lcd_cs {
 			rockchip,power_type = <REGULATOR>;
 			rockchip,delay = <10>;
 		};
@@ -221,7 +222,7 @@
 	};
 };
 
-&lcdc1 {
+&lcdc0 {
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 71d1af5051c7..72844fd99b9e 100755
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -419,27 +419,27 @@
                 status = "disabled";
         };
 
-	lcdc0: lcdc@ff940000 {
+	lcdc1: lcdc@ff940000 {
 		compatible = "rockchip,rk3288-lcdc";
 		rockchip,prop = <PRMRY>;
 		rochchip,pwr18 = <0>;
 		reg = <0xff940000 0x10000>;
 		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-		//pinctrl-names = "default", "gpio";
-		//pinctrl-0 = <&lcdc0_lcdc>;
-		//pinctrl-1 = <&lcdc0_gpio>;		
+		pinctrl-names = "default", "gpio";
+		pinctrl-0 = <&lcdc0_lcdc>;
+		pinctrl-1 = <&lcdc0_gpio>;		
 		status = "disabled";
 	};
 
-	lcdc1: lcdc@ff930000 {
+	lcdc0: lcdc@ff930000 {
 		compatible = "rockchip,rk3288-lcdc";
 		rockchip,prop = <EXTEND>;
 		rockchip,pwr18 = <0>;
 		reg = <0xff930000 0x10000>;
 		interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
-		pinctrl-names = "default", "gpio";
-		pinctrl-0 = <&lcdc0_lcdc>;
-		pinctrl-1 = <&lcdc0_gpio>;
+		//pinctrl-names = "default", "gpio";
+		//pinctrl-0 = <&lcdc0_lcdc>;
+		//pinctrl-1 = <&lcdc0_gpio>;
 		status = "disabled";
 	};