diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2013-10-13 11:33:25 +0100 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2013-10-13 11:33:25 +0100 |
commit | 2fba3e3c2d7c356b4df3227bcee673fae9af956b (patch) | |
tree | 808bc8a95ca6910c7a72ab4a2e6d96c566f28eb7 /config-armv7-generic | |
parent | 694dc9b61006384cf2cb8240dbb6488d6d3a0a86 (diff) | |
download | kernel-2fba3e3c2d7c356b4df3227bcee673fae9af956b.tar.gz kernel-2fba3e3c2d7c356b4df3227bcee673fae9af956b.tar.xz kernel-2fba3e3c2d7c356b4df3227bcee673fae9af956b.zip |
Minor ARM config updates/cleanups, ARM GPIO/I2C updates, ARM usb gadget updates
Diffstat (limited to 'config-armv7-generic')
-rw-r--r-- | config-armv7-generic | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config-armv7-generic b/config-armv7-generic index a89644a22..67b43d132 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -107,7 +107,6 @@ CONFIG_SCHED_SMT=y CONFIG_RCU_FANOUT=32 -# 2013/04/19 - disable due to stability issues in 3.9 for the moment CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_GOV_LADDER is not set CONFIG_CPU_IDLE_GOV_MENU=y @@ -139,7 +138,6 @@ CONFIG_LBDAF=y CONFIG_USE_OF=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_ARM_APPENDED_DTB=y -CONFIG_I2C_MUX_PINCTRL=m # General vexpress ARM drivers CONFIG_ARM_TIMER_SP804=y @@ -157,6 +155,7 @@ CONFIG_PL330_DMA=m CONFIG_AMBA_PL08X=y CONFIG_ARM_SP805_WATCHDOG=m CONFIG_GPIO_PL061=y +CONFIG_PL320_MBOX=y # usb CONFIG_USB_OTG=y @@ -185,6 +184,7 @@ CONFIG_PINMUX=y CONFIG_PINCONF=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SINGLE=y +CONFIG_GENERIC_PINCONF=y # CONFIG_PINCTRL_SAMSUNG is not set # CONFIG_PINCTRL_EXYNOS4 is not set @@ -193,7 +193,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=m # CONFIG_GPIO_EM is not set CONFIG_GPIO_ADNP=m CONFIG_GPIO_MCP23S08=m -CONFIG_POWER_RESET_GPIO=y CONFIG_SERIAL_8250_EM=m CONFIG_INPUT_GPIO_TILT_POLLED=m CONFIG_MDIO_BUS_MUX_GPIO=m @@ -247,9 +246,11 @@ CONFIG_MPCORE_WATCHDOG=m # Thermal / powersaving CONFIG_THERMAL=y -CONFIG_POWER_RESET_RESTART=y CONFIG_ARM_PSCI=y +# Mailbox +CONFIG_MAILBOX=y + # MTD # CONFIG_MG_DISK is not set CONFIG_MTD_DATAFLASH=m |