aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTony Prisk <linux@prisktech.co.nz>2013-03-25 04:11:40 -0400
committerOlof Johansson <olof@lixom.net>2013-04-02 13:19:55 -0400
commit806a94f20c8d78c96601878393a49fab577dcf2e (patch)
treef439f983174b542114f47179f8192b62eded6ecf /arch
parent063ab6daeb2ba5ef8f47c3fc04a749936c62d5bb (diff)
arm: vt8500: Add wm8850 config options to multi_v7_defconfig
This patch finally adds the WM8850 SoC to the multi_v7_defconfig. We don't have a seperate defconfig for this SoC as it is only available as a multiplatform option. Signed-off-by: Tony Prisk <linux@prisktech.co.nz> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/multi_v7_defconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index e3f2f6a5709b..2e67a272df70 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -8,6 +8,7 @@ CONFIG_MACH_ARMADA_XP=y
8CONFIG_ARCH_HIGHBANK=y 8CONFIG_ARCH_HIGHBANK=y
9CONFIG_ARCH_SOCFPGA=y 9CONFIG_ARCH_SOCFPGA=y
10CONFIG_ARCH_SUNXI=y 10CONFIG_ARCH_SUNXI=y
11CONFIG_ARCH_WM8850=y
11# CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set 12# CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set
12CONFIG_ARCH_ZYNQ=y 13CONFIG_ARCH_ZYNQ=y
13CONFIG_ARM_ERRATA_754322=y 14CONFIG_ARM_ERRATA_754322=y
@@ -43,6 +44,8 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
43CONFIG_SERIAL_OF_PLATFORM=y 44CONFIG_SERIAL_OF_PLATFORM=y
44CONFIG_SERIAL_SIRFSOC=y 45CONFIG_SERIAL_SIRFSOC=y
45CONFIG_SERIAL_SIRFSOC_CONSOLE=y 46CONFIG_SERIAL_SIRFSOC_CONSOLE=y
47CONFIG_SERIAL_VT8500=y
48CONFIG_SERIAL_VT8500_CONSOLE=y
46CONFIG_IPMI_HANDLER=y 49CONFIG_IPMI_HANDLER=y
47CONFIG_IPMI_SI=y 50CONFIG_IPMI_SI=y
48CONFIG_I2C=y 51CONFIG_I2C=y
@@ -54,6 +57,7 @@ CONFIG_SPI_SIRF=y
54CONFIG_GPIO_PL061=y 57CONFIG_GPIO_PL061=y
55CONFIG_FB=y 58CONFIG_FB=y
56CONFIG_FB_ARMCLCD=y 59CONFIG_FB_ARMCLCD=y
60CONFIG_FB_WM8505=y
57CONFIG_FRAMEBUFFER_CONSOLE=y 61CONFIG_FRAMEBUFFER_CONSOLE=y
58CONFIG_USB=y 62CONFIG_USB=y
59CONFIG_USB_ISP1760_HCD=y 63CONFIG_USB_ISP1760_HCD=y
@@ -63,12 +67,16 @@ CONFIG_MMC_ARMMMCI=y
63CONFIG_MMC_SDHCI=y 67CONFIG_MMC_SDHCI=y
64CONFIG_MMC_SDHCI_PLTFM=y 68CONFIG_MMC_SDHCI_PLTFM=y
65CONFIG_MMC_SDHCI_SPEAR=y 69CONFIG_MMC_SDHCI_SPEAR=y
70CONFIG_MMC_WMT=y
66CONFIG_EDAC=y 71CONFIG_EDAC=y
67CONFIG_EDAC_MM_EDAC=y 72CONFIG_EDAC_MM_EDAC=y
68CONFIG_EDAC_HIGHBANK_MC=y 73CONFIG_EDAC_HIGHBANK_MC=y
69CONFIG_EDAC_HIGHBANK_L2=y 74CONFIG_EDAC_HIGHBANK_L2=y
70CONFIG_RTC_CLASS=y 75CONFIG_RTC_CLASS=y
71CONFIG_RTC_DRV_PL031=y 76CONFIG_RTC_DRV_PL031=y
77CONFIG_RTC_DRV_VT8500=y
78CONFIG_PWM=y
79CONFIG_PWM_VT8500=y
72CONFIG_DMADEVICES=y 80CONFIG_DMADEVICES=y
73CONFIG_PL330_DMA=y 81CONFIG_PL330_DMA=y
74CONFIG_SIRF_DMA=y 82CONFIG_SIRF_DMA=y