From 623b83c43b7fb3086350d28d31233ec01d685018 Mon Sep 17 00:00:00 2001 From: lw Date: Fri, 14 Sep 2012 14:09:35 +0800 Subject: [PATCH] phonepad:add CONFIG_UART1_RK29 --- arch/arm/configs/rk30_phonepad_c8003_defconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/rk30_phonepad_c8003_defconfig b/arch/arm/configs/rk30_phonepad_c8003_defconfig index 256598c9bb5a..75845d6c09a7 100755 --- a/arch/arm/configs/rk30_phonepad_c8003_defconfig +++ b/arch/arm/configs/rk30_phonepad_c8003_defconfig @@ -26,7 +26,7 @@ CONFIG_DDR_FREQ=y CONFIG_RK_CLOCK_PROC=y CONFIG_CLK_SWITCH_TO_32K=y CONFIG_RK30_I2C_INSRAM=y -CONFIG_WIFI_COMBO_MODULE_CONTROL_FUNC=y +CONFIG_WIFI_CONTROL_FUNC=y CONFIG_MACH_RK30_PHONE_PAD=y # CONFIG_SWP_EMULATE is not set CONFIG_FIQ_DEBUGGER=y @@ -262,6 +262,7 @@ CONFIG_GYROSCOPE_DEVICE=y CONFIG_SERIAL_RK29=y CONFIG_UART0_RK29=y CONFIG_UART0_CTS_RTS_RK29=y +CONFIG_UART1_RK29=y CONFIG_UART3_RK29=y CONFIG_UART3_CTS_RTS_RK29=y # CONFIG_HW_RANDOM is not set @@ -273,6 +274,7 @@ CONFIG_I2C2_CONTROLLER_RK30=y CONFIG_I2C3_CONTROLLER_RK30=y CONFIG_I2C4_CONTROLLER_RK30=y CONFIG_RK_HEADSET_IRQ_HOOK_ADC_DET=y +CONFIG_GPIO_SYSFS=y CONFIG_GPIO_WM831X=y CONFIG_EXPANDED_GPIO_NUM=0 CONFIG_EXPANDED_GPIO_IRQ_NUM=0 @@ -404,7 +406,6 @@ CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_EMBEDDED_SDIO=y CONFIG_MMC_PARANOID_SD_INIT=y CONFIG_SDMMC_RK29=y -CONFIG_RK29_SDIO_IRQ_FROM_GPIO=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y -- 2.34.1