diff options
author | Tony Prisk <linux@prisktech.co.nz> | 2013-03-25 04:11:40 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-02 13:19:55 -0400 |
commit | 806a94f20c8d78c96601878393a49fab577dcf2e (patch) | |
tree | f439f983174b542114f47179f8192b62eded6ecf /arch/arm/configs | |
parent | 063ab6daeb2ba5ef8f47c3fc04a749936c62d5bb (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/arm/configs')
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 8 |
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 | |||
8 | CONFIG_ARCH_HIGHBANK=y | 8 | CONFIG_ARCH_HIGHBANK=y |
9 | CONFIG_ARCH_SOCFPGA=y | 9 | CONFIG_ARCH_SOCFPGA=y |
10 | CONFIG_ARCH_SUNXI=y | 10 | CONFIG_ARCH_SUNXI=y |
11 | CONFIG_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 |
12 | CONFIG_ARCH_ZYNQ=y | 13 | CONFIG_ARCH_ZYNQ=y |
13 | CONFIG_ARM_ERRATA_754322=y | 14 | CONFIG_ARM_ERRATA_754322=y |
@@ -43,6 +44,8 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | |||
43 | CONFIG_SERIAL_OF_PLATFORM=y | 44 | CONFIG_SERIAL_OF_PLATFORM=y |
44 | CONFIG_SERIAL_SIRFSOC=y | 45 | CONFIG_SERIAL_SIRFSOC=y |
45 | CONFIG_SERIAL_SIRFSOC_CONSOLE=y | 46 | CONFIG_SERIAL_SIRFSOC_CONSOLE=y |
47 | CONFIG_SERIAL_VT8500=y | ||
48 | CONFIG_SERIAL_VT8500_CONSOLE=y | ||
46 | CONFIG_IPMI_HANDLER=y | 49 | CONFIG_IPMI_HANDLER=y |
47 | CONFIG_IPMI_SI=y | 50 | CONFIG_IPMI_SI=y |
48 | CONFIG_I2C=y | 51 | CONFIG_I2C=y |
@@ -54,6 +57,7 @@ CONFIG_SPI_SIRF=y | |||
54 | CONFIG_GPIO_PL061=y | 57 | CONFIG_GPIO_PL061=y |
55 | CONFIG_FB=y | 58 | CONFIG_FB=y |
56 | CONFIG_FB_ARMCLCD=y | 59 | CONFIG_FB_ARMCLCD=y |
60 | CONFIG_FB_WM8505=y | ||
57 | CONFIG_FRAMEBUFFER_CONSOLE=y | 61 | CONFIG_FRAMEBUFFER_CONSOLE=y |
58 | CONFIG_USB=y | 62 | CONFIG_USB=y |
59 | CONFIG_USB_ISP1760_HCD=y | 63 | CONFIG_USB_ISP1760_HCD=y |
@@ -63,12 +67,16 @@ CONFIG_MMC_ARMMMCI=y | |||
63 | CONFIG_MMC_SDHCI=y | 67 | CONFIG_MMC_SDHCI=y |
64 | CONFIG_MMC_SDHCI_PLTFM=y | 68 | CONFIG_MMC_SDHCI_PLTFM=y |
65 | CONFIG_MMC_SDHCI_SPEAR=y | 69 | CONFIG_MMC_SDHCI_SPEAR=y |
70 | CONFIG_MMC_WMT=y | ||
66 | CONFIG_EDAC=y | 71 | CONFIG_EDAC=y |
67 | CONFIG_EDAC_MM_EDAC=y | 72 | CONFIG_EDAC_MM_EDAC=y |
68 | CONFIG_EDAC_HIGHBANK_MC=y | 73 | CONFIG_EDAC_HIGHBANK_MC=y |
69 | CONFIG_EDAC_HIGHBANK_L2=y | 74 | CONFIG_EDAC_HIGHBANK_L2=y |
70 | CONFIG_RTC_CLASS=y | 75 | CONFIG_RTC_CLASS=y |
71 | CONFIG_RTC_DRV_PL031=y | 76 | CONFIG_RTC_DRV_PL031=y |
77 | CONFIG_RTC_DRV_VT8500=y | ||
78 | CONFIG_PWM=y | ||
79 | CONFIG_PWM_VT8500=y | ||
72 | CONFIG_DMADEVICES=y | 80 | CONFIG_DMADEVICES=y |
73 | CONFIG_PL330_DMA=y | 81 | CONFIG_PL330_DMA=y |
74 | CONFIG_SIRF_DMA=y | 82 | CONFIG_SIRF_DMA=y |