summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-08-13 07:41:01 +0100
committerPeter Robinson <pbrobinson@gmail.com>2014-08-13 07:41:01 +0100
commita412315350b506878e6751c49d0fdbc71a123765 (patch)
tree8eb02d24de668e57133bc42e630c5ca023ae9a12 /config-arm-generic
parent574fd2c3000f7d97cc63e8ced5ff416ee14042a2 (diff)
downloadkernel-a412315350b506878e6751c49d0fdbc71a123765.tar.gz
kernel-a412315350b506878e6751c49d0fdbc71a123765.tar.xz
kernel-a412315350b506878e6751c49d0fdbc71a123765.zip
- 3.17 ARMv7 updates
- Cleanup some old removed options - Disable legacy USB OTG (using new configfs equivilents)
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic21
1 files changed, 4 insertions, 17 deletions
diff --git a/config-arm-generic b/config-arm-generic
index cd81d766d..7cbaeefec 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -42,6 +42,7 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
# ARM AMBA generic HW
CONFIG_ARM_AMBA=y
CONFIG_ARM_CCI=y
+CONFIG_ARM_CCN=y
CONFIG_ARM_DMA_USE_IOMMU=y
CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
CONFIG_ARM_GIC=y
@@ -143,8 +144,8 @@ CONFIG_I2C_MUX_PINCTRL=m
CONFIG_I2C_MUX_PCA9541=m
CONFIG_I2C_MUX_PCA954x=m
-# bus
-# CONFIG_ARM_CCN is not set
+# spi
+CONFIG_SPI_PL022=m
# Sensors
CONFIG_SENSORS_IIO_HWMON=m
@@ -261,21 +262,7 @@ CONFIG_CMA_AREAS=7
# CONFIG_DEBUG_SET_MODULE_RONX is not set
-# spi
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_PL022 is not set
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
-#
# CONFIG_LATTICE_ECP3_CONFIG is not set
# CONFIG_BMP085_SPI is not set
# CONFIG_TI_DAC7512 is not set
+# CONFIG_SPI_ROCKCHIP is not set