diff options
| author | Sundar R Iyer <sundar.iyer@stericsson.com> | 2010-03-25 20:23:06 +0530 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:44:51 -0600 |
| commit | b14f384355837142e1975c2a114c0db9bb40c39b (patch) | |
| tree | 700c0ac375c5d8a852e2866a072473644d449631 /arch/arm/configs | |
| parent | b9d383f8b7a3b288cffc75da85aca83fd4ce5106 (diff) | |
u8500-pm : update power defconfig for post 4.5 changes
Signed-off-by: Sundar R Iyer <sundar.iyer@stericsson.com>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mop500_power_defconfig | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/arch/arm/configs/mop500_power_defconfig b/arch/arm/configs/mop500_power_defconfig index 677c16f0442..592b977f325 100644 --- a/arch/arm/configs/mop500_power_defconfig +++ b/arch/arm/configs/mop500_power_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.29-gcov -# Mon Mar 8 18:07:06 2010 +# Linux kernel version: 2.6.29 +# Thu Mar 25 20:11:47 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -169,15 +169,15 @@ CONFIG_FREEZER=y # CONFIG_ARCH_MSM is not set # CONFIG_ARCH_W90X900 is not set CONFIG_ARCH_U8500=y - -# -# 8500 target platform -# +CONFIG_PLAT_NOMADIK=y +CONFIG_NOMADIK_GPIO=y +CONFIG_UX500_SOC_DB8500=y # CONFIG_MACH_U8500_SIMULATOR is not set # CONFIG_MACH_U5500_SIMULATOR is not set CONFIG_MACH_U8500_MOP=y CONFIG_U8500_CPUIDLE=y CONFIG_U8500_CPUFREQ=y +CONFIG_U8500_PM=y CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y CONFIG_MCDE_ENABLE_FEATURE_HW_V1_SUPPORT=y CONFIG_GPIO_STM=y @@ -227,11 +227,6 @@ CONFIG_FB_U8500_MCDE_CHANNELC0_INPUT_BGR=0x0 # CONFIG_FB_U8500_MCDE_CHANNELC1 is not set CONFIG_FB_U8500_MCDE_CHANNELC1_INPUT_16BPP_TYPE=0 CONFIG_FB_U8500_MCDE_CHANNELC1_INPUT_BGR=0x0 -CONFIG_U8500_TARGET="mop500" - -# -# Target chip used U8500 -# CONFIG_FORCE_MAX_ZONEORDER=12 # @@ -611,6 +606,8 @@ CONFIG_U8500_HSI_MODEM_EXTERNAL=y # CONFIG_U8500_HSI_MODEM_INTERNAL is not set CONFIG_U8500_HSI_MODEM_DIRECTION=0x1 CONFIG_U8500_SHRM=y +# CONFIG_ED_V1_VERSION is not set +CONFIG_V1_UPDATES_VERSION=y # CONFIG_U8500_SHRM_LOOP_BACK is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -727,7 +724,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set # CONFIG_TOUCHSCREEN_TSC2007 is not set -CONFIG_U8500_TSC=y +CONFIG_U8500_TSC=m CONFIG_U8500_TSC_SINGLETOUCH=y # CONFIG_U8500_TSC_MULTITOUCH is not set # CONFIG_TOUCHP_EXT_CLK is not set @@ -794,12 +791,12 @@ CONFIG_I2C_HELPER_AUTO=y # # I2C Hardware Bus support # -CONFIG_I2C_STM=y # # I2C system bus drivers (mostly embedded / system-on-chip) # # CONFIG_I2C_GPIO is not set +CONFIG_I2C_NOMADIK=y # CONFIG_I2C_OCORES is not set # CONFIG_I2C_SIMTEC is not set |