diff options
author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2014-05-27 13:04:28 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-05-27 14:07:52 -0400 |
commit | 263c08af44741697202b85e631a964ee85200eb0 (patch) | |
tree | 4ecb14941e1562612c37b0ef339ae0b173405913 | |
parent | 0279394672bf2299a4d3a994c56536bb484922e3 (diff) |
ARM: multi_v7_defconfig: Enable Zynq peripheral drivers
A few drivers for Zynq peripherals made it into mainline recently.
Enable them in the defconfig. The following devices are enabled:
- Cadence Macb Ethernet controller
- Cadence I2C controller
- Arasan SDHCI
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 5b9a320c79e4..f3ef03183e31 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
@@ -128,6 +128,7 @@ CONFIG_SATA_HIGHBANK=y | |||
128 | CONFIG_SATA_MV=y | 128 | CONFIG_SATA_MV=y |
129 | CONFIG_NETDEVICES=y | 129 | CONFIG_NETDEVICES=y |
130 | CONFIG_SUN4I_EMAC=y | 130 | CONFIG_SUN4I_EMAC=y |
131 | CONFIG_MACB=y | ||
131 | CONFIG_NET_CALXEDA_XGMAC=y | 132 | CONFIG_NET_CALXEDA_XGMAC=y |
132 | CONFIG_MV643XX_ETH=y | 133 | CONFIG_MV643XX_ETH=y |
133 | CONFIG_MVNETA=y | 134 | CONFIG_MVNETA=y |
@@ -182,6 +183,7 @@ CONFIG_I2C_CHARDEV=y | |||
182 | CONFIG_I2C_MUX=y | 183 | CONFIG_I2C_MUX=y |
183 | CONFIG_I2C_MUX_PCA954x=y | 184 | CONFIG_I2C_MUX_PCA954x=y |
184 | CONFIG_I2C_MUX_PINCTRL=y | 185 | CONFIG_I2C_MUX_PINCTRL=y |
186 | CONFIG_I2C_CADENCE=y | ||
185 | CONFIG_I2C_DESIGNWARE_PLATFORM=y | 187 | CONFIG_I2C_DESIGNWARE_PLATFORM=y |
186 | CONFIG_I2C_MV64XXX=y | 188 | CONFIG_I2C_MV64XXX=y |
187 | CONFIG_I2C_SIRF=y | 189 | CONFIG_I2C_SIRF=y |
@@ -283,6 +285,7 @@ CONFIG_MMC=y | |||
283 | CONFIG_MMC_BLOCK_MINORS=16 | 285 | CONFIG_MMC_BLOCK_MINORS=16 |
284 | CONFIG_MMC_ARMMMCI=y | 286 | CONFIG_MMC_ARMMMCI=y |
285 | CONFIG_MMC_SDHCI=y | 287 | CONFIG_MMC_SDHCI=y |
288 | CONFIG_MMC_SDHCI_OF_ARASAN=y | ||
286 | CONFIG_MMC_SDHCI_ESDHC_IMX=y | 289 | CONFIG_MMC_SDHCI_ESDHC_IMX=y |
287 | CONFIG_MMC_SDHCI_PXAV3=y | 290 | CONFIG_MMC_SDHCI_PXAV3=y |
288 | CONFIG_MMC_SDHCI_TEGRA=y | 291 | CONFIG_MMC_SDHCI_TEGRA=y |