leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The mxs soc changes for 3.10:

Browse Source 
* A few mxs_defconfig changes
 * Select ARM_CPU_SUSPEND for suspend testing
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJRYoNvAAoJEFBXWFqHsHzODUkH/1lNB7sBqTEJqerrbatxv2nk
 Y3sVVeqWssux4NxkvhNxb5wMCcSuvRgNK98AZ+KNv5h5usRwamCJExy7uBk548tu
 Y5mjPfqJVwdVrqECaUHBX3du1mbe1rSNtCaeGOQhTMpExhzn4IqFmvtBD+Wy36UB
 88UShj2OvCi2Ka1IAIfD3k+ODRg/2sxUnY8Z2XbiD1Ei82Y3S8n1463dBs9eQlxo
 jrVR3FFQ2pvnXZv9nA0D1m2H0EvDDjmWUlnt2jgs7eSy7d1y5CsWOiO0IQxKKz5T
 Z4WOp70PvUoYbU8hPDibYnCxhqYL+thhYN0iWWMbPHV0ZndDt89V4pejrpTWz5I=
 =/o00
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2013-04-09 16:38:48 +02:00
commit 56734ee283
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/configs/mxs_defconfig
View File

@ -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

2
arch/arm/mach-mxs/Kconfig
View File

@ -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