shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
陈亮
2014-07-31 05:37:07 -07:00
parent d47b22f1f0 411e9d7737
commit 0d2690fd73
4 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/boot/dts/rk3126-sdk.dts Normal file → Executable file
View File

@@ -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>;
};
};
};

13
arch/arm/boot/dts/rk3128-sdk.dts Normal file → Executable file
View File

@@ -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>;
};
};
};

33
arch/arm/boot/dts/rk312x-sdk.dtsi Normal file → Executable file
View File

@@ -143,31 +143,18 @@
};
};
&fb {
rockchip,disp-mode = <ONE_DUAL>;
rockchip,uboot-logo-on = <0>;
};
&fb {
rockchip,disp-mode = <ONE_DUAL>;
rockchip,uboot-logo-on = <0>;
};
&rk_screen {
display-timings = <&disp_timings>;
};
&rk_screen {
display-timings = <&disp_timings>;
};
&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>;
};
};
};
&hdmi {
status = "okay";
};
&hdmi {
status = "okay";
};
/include/ "rk818.dtsi"
&rk818 {

2
drivers/video/rockchip/rk_fb.c
View File

@@ -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;