summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-10-13 11:33:25 +0100
committerPeter Robinson <pbrobinson@gmail.com>2013-10-13 11:33:25 +0100
commit2fba3e3c2d7c356b4df3227bcee673fae9af956b (patch)
tree808bc8a95ca6910c7a72ab4a2e6d96c566f28eb7 /config-arm-generic
parent694dc9b61006384cf2cb8240dbb6488d6d3a0a86 (diff)
downloadkernel-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-arm-generic')
-rw-r--r--config-arm-generic16
1 files changed, 15 insertions, 1 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 6f3811f01..21f66b0f1 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -17,6 +17,7 @@ CONFIG_ARM_ARCH_TIMER=y
# CONFIG_ARM_DT_BL_CPUFREQ is not set
CONFIG_NR_CPUS=8
CONFIG_ARM_DMA_USE_IOMMU=y
+CONFIG_DMA_VIRTUAL_CHANNELS=y
# ARM AMBA generic HW
CONFIG_ARM_AMBA=y
@@ -44,6 +45,7 @@ CONFIG_PROC_DEVICETREE=y
CONFIG_OF=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_DEVICE=y
+CONFIG_OF_DYNAMIC=y
CONFIG_OF_EARLY_FLATTREE=y
CONFIG_OF_FLATTREE=y
CONFIG_OF_GPIO=y
@@ -77,11 +79,23 @@ CONFIG_MTD_PHYSMAP_OF=m
# CONFIG_MTD_PHYSMAP_COMPAT is not set
# GPIO
-CONFIG_GENERIC_GPIO=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIO_GENERIC=m
CONFIG_GPIOLIB=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_MDIO_GPIO=m
CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_RESTART=y
+
+#i2c
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_GPIO=m
+CONFIG_I2C_MUX=m
+# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_MUX_PCA9541=m
# MFD
CONFIG_MFD_CORE=m