summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-03-12 12:52:12 +0000
committerPeter Robinson <pbrobinson@gmail.com>2014-03-12 12:52:12 +0000
commit064542de7821bbc57f796047ef067000d016a4fb (patch)
treea14118eda66bd84839d41d7b2554c6decaacce64 /config-arm-generic
parent93ec8b7d38bffe6c33b18644e05100e92c06b8b3 (diff)
downloadkernel-064542de7821bbc57f796047ef067000d016a4fb.tar.gz
kernel-064542de7821bbc57f796047ef067000d016a4fb.tar.xz
kernel-064542de7821bbc57f796047ef067000d016a4fb.zip
Add some general missing ARM drivers (mostly sound), ARM config tweaks and cleanups, Update i.MX6 dtb
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic5
1 files changed, 3 insertions, 2 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 7e95287b5..db9c50ee1 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -30,6 +30,7 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
CONFIG_NR_CPUS=8
CONFIG_ARM_DMA_USE_IOMMU=y
+# CONFIG_ARM_SMMU is not set
CONFIG_SWIOTLB=y
CONFIG_DMA_VIRTUAL_CHANNELS=y
CONFIG_FB_SIMPLE=y
@@ -68,6 +69,7 @@ CONFIG_OF_EARLY_FLATTREE=y
CONFIG_OF_FLATTREE=y
CONFIG_OF_GPIO=y
CONFIG_OF_I2C=m
+CONFIG_OF_IOMMU=y
CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=m
CONFIG_OF_MTD=y
@@ -127,7 +129,7 @@ CONFIG_SENSORS_IIO_HWMON=m
CONFIG_IIO_SYSFS_TRIGGER=m
# PHY framework
-CONFIG_GENERIC_PHY=m
+CONFIG_GENERIC_PHY=y
# MFD
CONFIG_MFD_CORE=m
@@ -158,7 +160,6 @@ CONFIG_CMA_AREAS=7
# CONFIG_DRM_SHMOBILE is not set
# CONFIG_I2C_SH_MOBILE is not set
# CONFIG_MMC_DW_SOCFPGA is not set
-# CONFIG_ARM_SMMU is not set
# CONFIG_I2C_NOMADIK is not set
# CONFIG_IRQ_DOMAIN_DEBUG is not set
# CONFIG_LEDS_RENESAS_TPU is not set