From a77f28b75e605c9cd76497de19a73c6abee205f5 Mon Sep 17 00:00:00 2001 From: luowei Date: Sun, 27 Mar 2011 21:13:27 +0800 Subject: [PATCH] add wm831x's config again because of being covered before --- arch/arm/configs/rk29_phonesdk_defconfig | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) mode change 100644 => 100755 arch/arm/configs/rk29_phonesdk_defconfig diff --git a/arch/arm/configs/rk29_phonesdk_defconfig b/arch/arm/configs/rk29_phonesdk_defconfig old mode 100644 new mode 100755 index a1faa0ff400a..9de595b72c02 --- a/arch/arm/configs/rk29_phonesdk_defconfig +++ b/arch/arm/configs/rk29_phonesdk_defconfig @@ -827,7 +827,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_IT7260 is not set CONFIG_TOUCHSCREEN_GT801_IIC=y CONFIG_INPUT_MISC=y -CONFIG_INPUT_LPSENSOR_ISL29028=y +# CONFIG_INPUT_LPSENSOR_ISL29028 is not set # CONFIG_INPUT_LPSENSOR_CM3602 is not set # CONFIG_INPUT_ATI_REMOTE is not set # CONFIG_INPUT_ATI_REMOTE2 is not set @@ -839,6 +839,7 @@ CONFIG_INPUT_LPSENSOR_ISL29028=y # CONFIG_INPUT_UINPUT is not set # CONFIG_INPUT_GPIO is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +CONFIG_INPUT_WM831X_ON=y # # Magnetometer sensors @@ -936,7 +937,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_GPIO is not set CONFIG_SPIM_RK29=y -# CONFIG_SPIM0_RK29 is not set +CONFIG_SPIM0_RK29=y CONFIG_SPIM1_RK29=y # @@ -970,6 +971,7 @@ CONFIG_GPIOLIB=y # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set # CONFIG_GPIO_WM8994 is not set +CONFIG_GPIO_WM831X=y # # PCI GPIO expanders: @@ -996,6 +998,8 @@ CONFIG_SPI_FPGA_GPIO_IRQ_NUM=16 CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set +CONFIG_WM831X_BACKUP=y +CONFIG_WM831X_POWER=y # CONFIG_BATTERY_DS2760 is not set # CONFIG_BATTERY_DS2782 is not set # CONFIG_BATTERY_BQ27x00 is not set @@ -1033,8 +1037,9 @@ CONFIG_MFD_CORE=y # CONFIG_PMIC_DA903X is not set CONFIG_MFD_WM8994=y # CONFIG_MFD_WM8400 is not set +CONFIG_MFD_WM831X=y # CONFIG_MFD_WM831X_I2C is not set -# CONFIG_MFD_WM831X_SPI is not set +CONFIG_MFD_WM831X_SPI=y # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_MC13783 is not set @@ -1048,6 +1053,7 @@ CONFIG_REGULATOR=y # CONFIG_REGULATOR_BQ24022 is not set # CONFIG_REGULATOR_MAX1586 is not set # CONFIG_REGULATOR_WM8994 is not set +CONFIG_REGULATOR_WM831X=y # CONFIG_REGULATOR_LP3971 is not set # CONFIG_REGULATOR_TPS65023 is not set # CONFIG_REGULATOR_TPS6507X is not set @@ -1226,6 +1232,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_WM831X=y CONFIG_BACKLIGHT_RK29_BL=y # @@ -1631,6 +1638,7 @@ CONFIG_RTC_HYM8563=y # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_V3020 is not set +CONFIG_RTC_DRV_WM831X=y # # on-CPU RTC drivers -- 2.34.1