From 242f5fa65bf161b13ac5888dcadb180478f54849 Mon Sep 17 00:00:00 2001 From: yxj Date: Mon, 17 Sep 2012 18:21:23 +0800 Subject: [PATCH] =?utf8?q?board=20rk30=EF=BC=8Crk3066b:modify=20config=20f?= =?utf8?q?or=20HDMI?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- arch/arm/mach-rk30/board-rk30-sdk.c | 4 ++-- arch/arm/mach-rk30/board-rk3066b-sdk.c | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c index 49cb588e0331..ee8719152591 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk.c +++ b/arch/arm/mach-rk30/board-rk30-sdk.c @@ -50,7 +50,7 @@ #include #endif -#if defined(CONFIG_HDMI_RK30) +#if defined(CONFIG_RK_HDMI) #include "../../../drivers/video/rockchip/hdmi/rk_hdmi.h" #endif @@ -620,7 +620,7 @@ struct rk29fb_info lcdc0_screen_info = { #if defined(CONFIG_LCDC1_RK30) struct rk29fb_info lcdc1_screen_info = { - #if defined(CONFIG_HDMI_RK30) + #if defined(CONFIG_RK_HDMI) .prop = EXTEND, //extend display device .lcd_info = NULL, .set_screen_info = hdmi_init_lcdc, diff --git a/arch/arm/mach-rk30/board-rk3066b-sdk.c b/arch/arm/mach-rk30/board-rk3066b-sdk.c index 3d759afba2c1..bbeb2fe18510 100755 --- a/arch/arm/mach-rk30/board-rk3066b-sdk.c +++ b/arch/arm/mach-rk30/board-rk3066b-sdk.c @@ -51,7 +51,7 @@ #include #endif -#if defined(CONFIG_HDMI_RK30) +#if defined(CONFIG_RK_HDMI) #include "../../../drivers/video/rockchip/hdmi/rk_hdmi.h" #endif @@ -540,7 +540,7 @@ struct rk29fb_info lcdc0_screen_info = { #if defined(CONFIG_LCDC1_RK3066B) struct rk29fb_info lcdc1_screen_info = { - #if defined(CONFIG_HDMI_RK30) + #if defined(CONFIG_RK_HDMI) .prop = EXTEND, //extend display device .lcd_info = NULL, .set_screen_info = hdmi_init_lcdc, @@ -632,9 +632,16 @@ static struct platform_device device_lcdc1 = { #endif #if defined(CONFIG_MFD_RK610) +#if 1 #define RK610_RST_PIN_MUX_NAME GPIO2C5_LCDC1DATA21_SMCADDR5_NAME #define RK610_RST_PIN_MUX_MODE GPIO2C_GPIO2C5 #define RK610_RST_PIN RK30_PIN2_PC5 +#else +#define RK610_RST_PIN_MUX_NAME GPIO2D6_SMCCSN1_NAME +#define RK610_RST_PIN_MUX_MODE GPIO2D_GPIO2D6 +#define RK610_RST_PIN RK30_PIN2_PD6 + +#endif static int rk610_power_on_init(void) { int ret; @@ -1182,7 +1189,7 @@ static struct platform_device *devices[] __initdata = { #if defined(CONFIG_LCDC1_RK3066B) &device_lcdc1, #endif - + #ifdef CONFIG_BACKLIGHT_RK29_BL &rk29_device_backlight, #endif -- 2.34.1