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

diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index 67aca7f5f8de80e31f002dd9b753627e0e7aea52..4b524a08b02a17a637f03d5ecd4b1dfd73aa822a 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -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
 

diff --git a/arch/arm/mach-rk30/board-rk3168-tb.c b/arch/arm/mach-rk30/board-rk3168-tb.c
index 67d76135e8d51ed6b5a0ce5aa086215f08047a0c..f5b3b48d29b4a5b4bc8085e151b1a08c397817c7 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3168-tb.c
+++ b/arch/arm/mach-rk30/board-rk3168-tb.c
@@ -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
 

diff --git a/arch/arm/mach-rk3188/board-rk3188-jettaplus.c b/arch/arm/mach-rk3188/board-rk3188-jettaplus.c
index 03c8ede6d3de1c688d2b71733f4e69509f34bc93..75397fa91f9c0473027b5e11ea2a6cfd7e3831aa 100644 (file)
--- a/arch/arm/mach-rk3188/board-rk3188-jettaplus.c
+++ b/arch/arm/mach-rk3188/board-rk3188-jettaplus.c
@@ -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
+#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",