Merge branch 'develop-3.10-next' of ssh://10.10.10.29/rk/kernel into develop-3.10...

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
old mode 100644 (file)
new mode 100755 (executable)
index d295a80..5d245b5
--- 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 (file)
new mode 100755 (executable)
index 19253ae..79ca644
--- 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 (file)
new mode 100755 (executable)
index 5ddcf80..b744b8e
--- 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 {

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 4d4a534e7587c07446a30956678e10e6b6b4fbc2..ebc9c0bd419b0926589627f8e19444e154088ddc 100755 (executable)
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -3589,7 +3589,7 @@ static int init_lcdc_device_driver(struct rk_fb *rk_fb,
                                devm_kzalloc(dev_drv->dev,
                                             sizeof(struct rk_screen),
                                             GFP_KERNEL);
-               if (screen1) {
+               if (!screen1) {
                        dev_err(dev_drv->dev, "malloc screen1 for lcdc%d fail!",
                                dev_drv->id);
                        return -ENOMEM;