summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-01-12 14:20:41 +0000
committerPeter Robinson <pbrobinson@gmail.com>2014-01-12 14:20:41 +0000
commit39549c0eb37a4c221592b6359d2a5663b13978b7 (patch)
treefc49c1aa0df7732e0226cc6b55733c6c617bb373 /config-armv7-generic
parent97eebfc4785e598f3540d748b33b38676e4afd71 (diff)
downloadkernel-39549c0eb37a4c221592b6359d2a5663b13978b7.tar.gz
kernel-39549c0eb37a4c221592b6359d2a5663b13978b7.tar.xz
kernel-39549c0eb37a4c221592b6359d2a5663b13978b7.zip
Minor ARM config updates and cleanups
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic26
1 files changed, 19 insertions, 7 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index e5c7e8696..95723b34c 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -8,6 +8,7 @@ CONFIG_ARM=y
CONFIG_ARCH_MULTI_V7=y
CONFIG_CMDLINE=""
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
CONFIG_HAVE_ARM_ARCH_TIMER=y
CONFIG_HAVE_ARM_TWD=y
CONFIG_AEABI=y
@@ -110,7 +111,7 @@ CONFIG_RCU_FANOUT=32
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_GOV_LADDER is not set
CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
@@ -157,6 +158,13 @@ CONFIG_ARM_SP805_WATCHDOG=m
CONFIG_GPIO_PL061=y
CONFIG_PL320_MBOX=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_SPI=m
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_MMIO=m
+CONFIG_REGMAP_IRQ=y
+
# usb
CONFIG_USB_OTG=y
# CONFIG_USB_OTG_WHITELIST is not set
@@ -246,18 +254,20 @@ CONFIG_GENERIC_PINCONF=y
# GPIO
# CONFIG_GPIO_EM is not set
+CONFIG_GPIO_74X164=m
CONFIG_GPIO_ADNP=m
CONFIG_GPIO_MCP23S08=m
-CONFIG_SERIAL_8250_EM=m
-CONFIG_INPUT_GPIO_TILT_POLLED=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
-CONFIG_LEDS_GPIO=m
CONFIG_GPIO_MAX7301=m
CONFIG_GPIO_MC33880=m
-CONFIG_GPIO_74X164=m
CONFIG_GPIO_TPS65910=y
CONFIG_GPIO_TPS65912=m
+CONFIG_LEDS_GPIO=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_INPUT_GPIO_TILT_POLLED=m
+CONFIG_INPUT_MATRIXKMAP=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_MATRIX=m
# CONFIG_GPIO_RCAR is not set
CONFIG_W1_MASTER_GPIO=m
@@ -477,6 +487,7 @@ CONFIG_SRAM=y
# Ethernet
CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
CONFIG_ENC28J60=m
CONFIG_LIBERTAS_SPI=m
CONFIG_P54_SPI=m
@@ -538,6 +549,7 @@ CONFIG_BPF_JIT=y
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
# CONFIG_LATTICE_ECP3_CONFIG is not set
# CONFIG_M25PXX_USE_FAST_READ is not set
+# CONFIG_SERIAL_8250_EM is not set
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
# CONFIG_SERIAL_IFX6X60 is not set