diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2014-05-10 21:59:43 +0100 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2014-05-10 21:59:43 +0100 |
commit | 5f0cb5e84b3a666943f3555abcbf7b8397bf9a17 (patch) | |
tree | 96e3fce8e5a95966bad2de0be73624e38ba2af00 /config-armv7 | |
parent | 3db76a27439c589263d389b816f560bc1badc6b4 (diff) | |
download | kernel-5f0cb5e84b3a666943f3555abcbf7b8397bf9a17.tar.gz kernel-5f0cb5e84b3a666943f3555abcbf7b8397bf9a17.tar.xz kernel-5f0cb5e84b3a666943f3555abcbf7b8397bf9a17.zip |
Enable Marvell Dove support, minor ARM cleanups
Diffstat (limited to 'config-armv7')
-rw-r--r-- | config-armv7 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/config-armv7 b/config-armv7 index 4e7662ebe..3478efefd 100644 --- a/config-armv7 +++ b/config-armv7 @@ -1,7 +1,6 @@ # ARM unified arch kernel # CONFIG_ARCH_BERLIN is not set -# CONFIG_MACH_DOVE is not set # CONFIG_ARCH_KEYSTONE is not set CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MXC=y @@ -28,6 +27,7 @@ CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_XP=y # CONFIG_MACH_ARMADA_375 is not set # CONFIG_MACH_ARMADA_38X is not set +CONFIG_MACH_DOVE=y CONFIG_MVEBU_DEVBUS=y CONFIG_PCI_MVEBU=y @@ -49,16 +49,19 @@ CONFIG_MVEBU_CLK_CORE=y CONFIG_MVEBU_CLK_COREDIV=y CONFIG_MVEBU_CLK_GATING=y CONFIG_MMC_MVSDIO=m +CONFIG_MMC_SDHCI_DOVE=m CONFIG_SPI_ORION=m CONFIG_USB_MV_UDC=m CONFIG_MVEBU_MBUS=y CONFIG_PHY_MVEBU_SATA=y CONFIG_ARMADA_THERMAL=m +CONFIG_DOVE_THERMAL=m CONFIG_DRM_ARMADA=m -# CONFIG_SND_KIRKWOOD_SOC is not set +CONFIG_ORION_WATCHDOG=m +CONFIG_SND_KIRKWOOD_SOC=m +CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m # CONFIG_CACHE_FEROCEON_L2 is not set # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set -# CONFIG_ORION_WATCHDOG is not set # omap CONFIG_ARCH_OMAP2PLUS_TYPICAL=y @@ -529,9 +532,7 @@ CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_MMC_SDHCI_TEGRA=m CONFIG_TEGRA_WATCHDOG=m - CONFIG_I2C_TEGRA=m -CONFIG_I2C_MUX_PCA954x=m CONFIG_TEGRA_SYSTEM_DMA=y CONFIG_TEGRA_EMC_SCALING_ENABLE=y |