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 288e1cf90c50b4f9c43cf911cc82b39e7369f99e..7d8dd84d926c33861a6b9463b07f869517f1b629 100755 (executable)
--- 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 f04653b0931bbfd860284b52e6ed2f198538fb2a..d437aae2ef6755370756c0ba5e3319a4e314a746 100755 (executable)
--- 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 71d1af5051c7270c1ae919284ff368d0ba01cb19..72844fd99b9e25c49e61b27cafc067e84c818638 100755 (executable)
--- 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";
        };