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

board rk30、rk3168-tb rk3188-jettaplus: modify lcdx_screen_info config

Browse Source
This commit is contained in:
yxj
2013-05-22 14:54:46 +08:00
parent f1087f6402
commit d84d81a6cc
3 changed files with 73 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
arch/arm/mach-rk30/board-rk30-sdk.c
View File

@@ -849,21 +849,39 @@ static int rk_fb_io_enable(void)
#if defined(CONFIG_LCDC0_RK30)
struct rk29fb_info lcdc0_screen_info = {
.prop = PRMRY, //primary display device
.io_init = rk_fb_io_init,
.io_disable = rk_fb_io_disable,
.io_enable = rk_fb_io_enable,
.set_screen_info = set_lcd_info,
#if defined(CONFIG_RK_HDMI) && defined(CONFIG_HDMI_SOURCE_LCDC0) && defined(CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL)
.prop = EXTEND, //extend display device
.io_init = NULL,
.io_disable = NULL,
.io_enable = NULL,
.set_screen_info = hdmi_init_lcdc,
#else
.prop = PRMRY, //primary display device
.io_init = rk_fb_io_init,
.io_disable = rk_fb_io_disable,
.io_enable = rk_fb_io_enable,
.set_screen_info = set_lcd_info,
#endif
};
#endif
#if defined(CONFIG_LCDC1_RK30)
struct rk29fb_info lcdc1_screen_info = {
#if defined(CONFIG_RK_HDMI)
.prop = EXTEND, //extend display device
.lcd_info = NULL,
.set_screen_info = hdmi_init_lcdc,
#endif
#if defined(CONFIG_RK_HDMI) && defined(CONFIG_HDMI_SOURCE_LCDC1) && defined(CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL)
.prop = EXTEND, //extend display device
.io_init = NULL,
.io_disable = NULL,
.io_enable = NULL,
.set_screen_info = hdmi_init_lcdc,
#else
.prop = PRMRY, //primary display device
.io_init = rk_fb_io_init,
.io_disable = rk_fb_io_disable,
.io_enable = rk_fb_io_enable,
.set_screen_info = set_lcd_info,
#endif
};
#endif

22
arch/arm/mach-rk30/board-rk3168-tb.c
View File

@@ -544,21 +544,37 @@ static int rk_fb_io_enable(void)
#if defined(CONFIG_LCDC0_RK3066B) || defined(CONFIG_LCDC0_RK3188)
struct rk29fb_info lcdc0_screen_info = {
#if defined(CONFIG_RK_HDMI) && defined(CONFIG_HDMI_SOURCE_LCDC0) && defined(CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL)
.prop = EXTEND, //extend display device
.io_init = NULL,
.io_disable = NULL,
.io_enable = NULL,
.set_screen_info = hdmi_init_lcdc,
#else
.prop = PRMRY, //primary display device
.io_init = rk_fb_io_init,
.io_disable = rk_fb_io_disable,
.io_enable = rk_fb_io_enable,
.set_screen_info = set_lcd_info,
#endif
};
#endif
#if defined(CONFIG_LCDC1_RK3066B) || defined(CONFIG_LCDC1_RK3188)
struct rk29fb_info lcdc1_screen_info = {
#if defined(CONFIG_RK_HDMI)
#if defined(CONFIG_RK_HDMI) && defined(CONFIG_HDMI_SOURCE_LCDC1) && defined(CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL)
.prop = EXTEND, //extend display device
.lcd_info = NULL,
.io_init = NULL,
.io_disable = NULL,
.io_enable = NULL,
.set_screen_info = hdmi_init_lcdc,
#endif
#else
.prop = PRMRY, //primary display device
.io_init = rk_fb_io_init,
.io_disable = rk_fb_io_disable,
.io_enable = rk_fb_io_enable,
.set_screen_info = set_lcd_info,
#endif
};
#endif

36
arch/arm/mach-rk3188/board-rk3188-jettaplus.c
View File

@@ -543,25 +543,41 @@ static int rk_fb_io_enable(void)
#if defined(CONFIG_LCDC0_RK3066B) || defined(CONFIG_LCDC0_RK3188)
struct rk29fb_info lcdc0_screen_info = {
#if defined(CONFIG_RK_HDMI)
.prop = EXTEND, //extend display device
.lcd_info = NULL,
#if defined(CONFIG_RK_HDMI) && defined(CONFIG_HDMI_SOURCE_LCDC0) && defined(CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL)
.prop = EXTEND, //extend display device
.io_init = NULL,
.io_disable = NULL,
.io_enable = NULL,
.set_screen_info = hdmi_init_lcdc,
#endif
};
#endif
#if defined(CONFIG_LCDC1_RK3066B) || defined(CONFIG_LCDC1_RK3188)
struct rk29fb_info lcdc1_screen_info = {
#else
.prop = PRMRY, //primary display device
.io_init = rk_fb_io_init,
.io_disable = rk_fb_io_disable,
.io_enable = rk_fb_io_enable,
.set_screen_info = set_lcd_info,
#endif
};
#endif
#if defined(CONFIG_LCDC1_RK3066B) || defined(CONFIG_LCDC1_RK3188)
struct rk29fb_info lcdc1_screen_info = {
#if defined(CONFIG_RK_HDMI) && defined(CONFIG_HDMI_SOURCE_LCDC1) && defined(CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL)
.prop = EXTEND, //extend display device
.io_init = NULL,
.io_disable = NULL,
.io_enable = NULL,
.set_screen_info = hdmi_init_lcdc,
#else
.prop = PRMRY, //primary display device
.io_init = rk_fb_io_init,
.io_disable = rk_fb_io_disable,
.io_enable = rk_fb_io_enable,
.set_screen_info = set_lcd_info,
#endif
};
#endif
static struct resource resource_fb[] = {
[0] = {
.name = "fb0 buf",