summaryrefslogtreecommitdiffstats
path: root/config-armv7-lpae
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-armv7-lpae
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-armv7-lpae')
-rw-r--r--config-armv7-lpae25
1 files changed, 11 insertions, 14 deletions
diff --git a/config-armv7-lpae b/config-armv7-lpae
index c1700626f..64698a52a 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -1,8 +1,6 @@
# ARM A15 lpae unified arch kernel
-CONFIG_ARCH_EXYNOS_MULTI=y
CONFIG_ARCH_KEYSTONE=y
CONFIG_ARCH_VIRT=y
-CONFIG_ARCH_EXYNOS5=y
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXC is not set
@@ -18,11 +16,6 @@ CONFIG_ARCH_EXYNOS5=y
# CONFIG_ARCH_TEGRA is not set
# CONFIG_ARCH_ZYNQ is not set
-
-# CONFIG_ARCH_EXYNOS4 is not set
-
-# CONFIG_EXYNOS_ATAGS is not set
-
CONFIG_ARM_LPAE=y
CONFIG_SYS_SUPPORTS_HUGETLBFS=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
@@ -76,6 +69,7 @@ CONFIG_PCI_EXYNOS=y
CONFIG_ARM_CCI=y
CONFIG_TCG_TIS_I2C_INFINEON=m
+# CONFIG_EXYNOS_ATAGS is not set
CONFIG_PINCTRL_EXYNOS=y
CONFIG_PINCTRL_EXYNOS5440=y
CONFIG_EXYNOS_IOMMU=y
@@ -111,12 +105,19 @@ CONFIG_USB_EHCI_S5P=y
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
-# CONFIG_KEYSTONE_USB_PHY is not set
-# CONFIG_GPIO_DAVINCI is not set
-# CONFIG_DAVINCI_WATCHDOG is not set
CONFIG_MMC_DW_EXYNOS=m
CONFIG_RTC_DRV_S3C=m
+# TI Keystone
+CONFIG_KEYSTONE_USB_PHY=m
+CONFIG_USB_DWC3_KEYSTONE=m
+CONFIG_GPIO_DAVINCI=y
+CONFIG_I2C_DAVINCI=m
+# CONFIG_DAVINCI_WATCHDOG is not set
+# CONFIG_SPI_DAVINCI is not set
+# CONFIG_SND_DAVINCI_SOC is not set
+# CONFIG_TI_SOC_THERMAL is not set
+
# Arndale/Origen
CONFIG_MFD_MAX8997=y
CONFIG_MFD_SEC_CORE=y
@@ -134,7 +135,3 @@ CONFIG_S3C_LOWLEVEL_UART_PORT=1
# CONFIG_S3C2410_WATCHDOG is not set
# CONFIG_MMC_SDHCI_S3C is not set
# CONFIG_TEGRA_HOST1X is not set
-# CONFIG_SPI_DAVINCI is not set
-# CONFIG_I2C_DAVINCI is not set
-# CONFIG_SND_DAVINCI_SOC is not set
-# CONFIG_TI_SOC_THERMAL is not set