diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 14:38:48 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 14:38:48 (GMT) |
| commit | 56734ee2835caaf62168c28281403b61b5826841 (patch) | |
| tree | f2bbdaf0fe6c041a0886a590eea32cff6972c76d | |
| parent | 6cd2f8e7da502272248f4bdefcb952a68318e02b (diff) | |
| parent | 656c284c5c517460245db159e122b0207f06f998 (diff) | |
| download | linux-56734ee2835caaf62168c28281403b61b5826841.tar.xz | |
Merge tag 'mxs-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
From Shawn Guo <shawn.guo@linaro.org>:
The mxs soc changes for 3.10:
* A few mxs_defconfig changes
* Select ARM_CPU_SUSPEND for suspend testing
* tag 'mxs-soc-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs_defconfig: Select watchdog driver
ARM: mxs_defconfig: Select CONFIG_MMC_UNSAFE_RESUME
ARM: mxs_defconfig: Build CONFIG_INPUT_EVDEV as built-in
ARM: mxs: Select ARM_CPU_SUSPEND
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/configs/mxs_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/Kconfig | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index 6a99e30..e9b1f6d 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig @@ -75,7 +75,7 @@ CONFIG_REALTEK_PHY=y CONFIG_MICREL_PHY=y # CONFIG_WLAN is not set # CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y @@ -99,6 +99,8 @@ CONFIG_SPI_MXS=y CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_STMP3XXX_RTC_WATCHDOG=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_FB=y @@ -122,6 +124,7 @@ CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_STORAGE=y CONFIG_USB_MXS_PHY=y CONFIG_MMC=y +CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_MXS=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig index ecc4319..c4495a1 100644 --- a/arch/arm/mach-mxs/Kconfig +++ b/arch/arm/mach-mxs/Kconfig @@ -3,6 +3,7 @@ if ARCH_MXS config SOC_IMX23 bool select ARM_AMBA + select ARM_CPU_SUSPEND if PM select CPU_ARM926T select HAVE_PWM select PINCTRL_IMX23 @@ -10,6 +11,7 @@ config SOC_IMX23 config SOC_IMX28 bool select ARM_AMBA + select ARM_CPU_SUSPEND if PM select CPU_ARM926T select HAVE_CAN_FLEXCAN if CAN select HAVE_PWM |