From bfc4a04ecc0422cdd24d7be23647465fb43e3f7c Mon Sep 17 00:00:00 2001 From: zyw Date: Wed, 18 May 2011 15:27:28 +0800 Subject: [PATCH] remove err when compile no fb --- arch/arm/mach-rk29/board-rk29sdk.c | 22 ++++++++++------------ drivers/video/display/Kconfig | 1 + drivers/video/hdmi/Kconfig | 3 ++- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c index 0be0d09cea0e..eb1cc3a63381 100755 --- a/arch/arm/mach-rk29/board-rk29sdk.c +++ b/arch/arm/mach-rk29/board-rk29sdk.c @@ -117,17 +117,25 @@ struct rk29_nand_platform_data rk29_nand_data = { .io_init = rk29_nand_io_init, }; +/***************************************************************************************** +* touch screen devices +* author: cf@rock-chips.com +*****************************************************************************************/ +#define TOUCH_SCREEN_STANDBY_PIN INVALID_GPIO +#define TOUCH_SCREEN_STANDBY_VALUE GPIO_HIGH +#define TOUCH_SCREEN_DISPLAY_PIN INVALID_GPIO +#define TOUCH_SCREEN_DISPLAY_VALUE GPIO_HIGH + #ifdef CONFIG_FB_RK29 /***************************************************************************************** * lcd devices * author: zyw@rock-chips.com *****************************************************************************************/ -//#ifdef CONFIG_LCD_TD043MGEA1 #define LCD_TXD_PIN INVALID_GPIO #define LCD_CLK_PIN INVALID_GPIO #define LCD_CS_PIN INVALID_GPIO /***************************************************************************************** -* frame buffe devices +* frame buffer devices pin define * author: zyw@rock-chips.com *****************************************************************************************/ #define FB_ID 0 @@ -139,16 +147,6 @@ struct rk29_nand_platform_data rk29_nand_data = { #define FB_DISPLAY_ON_VALUE GPIO_HIGH #define FB_LCD_STANDBY_VALUE GPIO_HIGH -//#endif -/***************************************************************************************** -* touch screen devices -* author: cf@rock-chips.com -*****************************************************************************************/ -#define TOUCH_SCREEN_STANDBY_PIN INVALID_GPIO -#define TOUCH_SCREEN_STANDBY_VALUE GPIO_HIGH -#define TOUCH_SCREEN_DISPLAY_PIN INVALID_GPIO -#define TOUCH_SCREEN_DISPLAY_VALUE GPIO_HIGH - static int rk29_lcd_io_init(void) { int ret = 0; diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig index 19e534aca13b..7faf10e5a2c6 100644 --- a/drivers/video/display/Kconfig +++ b/drivers/video/display/Kconfig @@ -6,6 +6,7 @@ menu "Display device support" config DISPLAY_SUPPORT tristate "Display panel/monitor support" + depends on FB_RK29 ---help--- This framework adds support for low-level control of a display. This includes support for power. diff --git a/drivers/video/hdmi/Kconfig b/drivers/video/hdmi/Kconfig index 26157f097bb3..b62e7dacf3c0 100644 --- a/drivers/video/hdmi/Kconfig +++ b/drivers/video/hdmi/Kconfig @@ -4,7 +4,8 @@ menu "HDMI" config HDMI tristate "HDMI support" - + depends on FB_RK29 + if HDMI config HDMI_OLD -- 2.34.1