summaryrefslogtreecommitdiffstats
path: root/config-arm-tegra
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2012-06-05 13:33:59 +0100
committerPeter Robinson <pbrobinson@gmail.com>2012-06-05 13:33:59 +0100
commit4ee438e84aa8bee5a65d27076ef3436e1337a0e2 (patch)
tree46f9c27a8c20187b8b1ea1a4b60e1847bd3eff10 /config-arm-tegra
parent48d35dba7a308ba6c6d97d99f7a3bd62b2d8cead (diff)
downloadkernel-4ee438e84aa8bee5a65d27076ef3436e1337a0e2.tar.gz
kernel-4ee438e84aa8bee5a65d27076ef3436e1337a0e2.tar.xz
kernel-4ee438e84aa8bee5a65d27076ef3436e1337a0e2.zip
Update ARM config options for 3.5, Enable MTD/UBI/JFFS2 on ARM platforms
Diffstat (limited to 'config-arm-tegra')
-rw-r--r--config-arm-tegra14
1 files changed, 9 insertions, 5 deletions
diff --git a/config-arm-tegra b/config-arm-tegra
index 1f20ce7f9..c9883a655 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -1,7 +1,7 @@
CONFIG_ARCH_TEGRA=y
CONFIG_ARCH_TEGRA_2x_SOC=y
-CONFIG_ARCH_TEGRA_3x_SOC=y
+# CONFIG_ARCH_TEGRA_3x_SOC is not set
# CONFIG_ARM_LPAE is not set
CONFIG_TEGRA_PCI=y
@@ -22,6 +22,9 @@ CONFIG_TEGRA_DEBUG_UARTD=y
CONFIG_NR_CPUS=4
CONFIG_ARM_CPU_TOPOLOGY=y
+CONFIG_TEGRA_IOMMU_GART=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+
CONFIG_I2C_TEGRA=y
CONFIG_MMC_SDHCI_TEGRA=y
@@ -59,8 +62,11 @@ CONFIG_USB_EHCI_TEGRA=y
CONFIG_RTC_DRV_TEGRA=m
CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA_ALC5632=m
CONFIG_SND_SOC_TEGRA_WM8903=m
CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+# CONFIG_SND_SOC_TEGRA30_AHUB is not set
+# CONFIG_SND_SOC_TEGRA30_I2S is not set
CONFIG_MFD_NVEC=y
CONFIG_KEYBOARD_NVEC=y
@@ -77,10 +83,8 @@ CONFIG_ARM_CPU_SUSPEND=y
CONFIG_PL310_ERRATA_753970=y
CONFIG_LEDS_RENESAS_TPU=y
-# CONFIG_SND_SOC_TEGRA_ALC5632 is not set
-
-CONFIG_PCI=y
-CONFIG_PCI_SYSCALL=y
+CONFIG_OF=y
+CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_OF_GPIO=y
CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y