diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 22:11:13 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 22:11:13 +0300 |
| commit | ccb0f688ea60b0b0128f3796f58879954c260f2f (patch) | |
| tree | 0877b4fdafd8b6cd46f41f148f7e85a7d27b9540 /arch/arm/configs/multi_v7_defconfig | |
| parent | dbb2bc9118da94ba261278068af300ad3e71efc8 (diff) | |
| parent | b72541b33825807d247b6455364db9cd3ca5d6ad (diff) | |
| download | linux-ccb0f688ea60b0b0128f3796f58879954c260f2f.tar.xz | |
Merge tag 'arm-soc/for-4.7/defconfig' of http://github.com/Broadcom/stblinux into next/defconfig
Merge "This pull request contains defconfig changes for Broadcom ARM-based SoCs"
from Florian Fainelli:
- Eric enables more BCM2835 peripherals in multi_v7_defconfig: watchdog, I2S,
switches from the sdhci-bcm2835 to the sdhci-iproc driver, DWC2 USB controller
- Eric also enables more BCM2835 peripherals in bcm2835_defconfig: VC4, NFS root
Power Management support, switching sdhci-bcm2835 for sdhci-iproc
* tag 'arm-soc/for-4.7/defconfig' of http://github.com/Broadcom/stblinux:
ARM: bcm2835: Enable NFS root support.
ARM: bcm2835: Enable the VC4 graphics driver in the defconfig
ARM: bcm2835: Enable CONFIG_PM.
ARM: bcm2835: Switch BCM2835 to sdhci-iproc.c for MMC
ARM: multi_v7_defconfig: Build in DWC2 USB support
ARM: multi_v7_defconfig: Switch BCM2835 to sdhci-iproc.c for MMC
ARM: multi_v7_defconfig: Add more BCM2835 support
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index e80662b73254..ca0f4f1bdaf4 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -446,6 +446,7 @@ CONFIG_TEGRA_WATCHDOG=m CONFIG_MESON_WATCHDOG=y CONFIG_DW_WATCHDOG=y CONFIG_DIGICOLOR_WATCHDOG=y +CONFIG_BCM2835_WDT=y CONFIG_MFD_AS3711=y CONFIG_MFD_AS3722=y CONFIG_MFD_ATMEL_FLEXCOM=y @@ -575,6 +576,7 @@ CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=m CONFIG_SND_ATMEL_SOC=m CONFIG_SND_ATMEL_SOC_WM8904=m +CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_SND_SOC_FSL_SAI=m CONFIG_SND_SOC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m @@ -620,7 +622,7 @@ CONFIG_USB_STORAGE=y CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_SUNXI=m CONFIG_USB_DWC3=y -CONFIG_USB_DWC2=m +CONFIG_USB_DWC2=y CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y @@ -651,7 +653,6 @@ CONFIG_MMC_SDHCI_SPEAR=y CONFIG_MMC_SDHCI_S3C=y CONFIG_MMC_SDHCI_S3C_DMA=y CONFIG_MMC_SDHCI_BCM_KONA=y -CONFIG_MMC_SDHCI_BCM2835=y CONFIG_MMC_SDHCI_ST=y CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y |