This pull request contains defconfig changes for Broadcom ARM-based SoCs:

- 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXG8pNAAoJEIfQlpxEBwcEipUQAMqVGtqqdxEEGa0nwGGabpms
 oxKUkAPgflzYWoPy28WoCoaRGceNz+aP1H204nqJqXhHbUKeJaTPTu6TwMMMx2K5
 vBsGQan7flOuPEaGEsRTb5bxG6DoTxa9FdfMFmekUWwEaxvmTwvjqyh62P9AwNOH
 IKKdHOCIqJmMOcvzr8Ptr2Z2+2wOojzteyo7U5WZ0oqg/+UIKRnnQqX/k+OE8swj
 iX7u48fhtymPk/wDCks51IsV9PdJLIITqg73Dtxp7ltY1tvPDMUdsZyWOxo3A8b7
 B8251VD/njgITbFOZUDn7X0QdH0NPwuZzIcp3Mdcz/ZPy++uJbotKSHOKFsnZXuU
 f5DfR8UleJ8IadOUpLVDG3mr5tX7UyxogN35cmA9X394T9qKgaq9626namcGWS/1
 LfSD+Tg/AQQUA4sK8rhk7qXSTO0VLKTP314l/TyV2L5qMeZPsoabAllYhC5/XcXI
 2nwsqbUxvyUAt2asiVtPOA5sFHCkyT7Cq55mxYbqOEdqteSJm2iqWRLBh90C2F6X
 c0JpdFZs9Ag5LOjRr9k6cDb9XhWdhdIk9Xpq1KPVsQBq7F8giNgIq21nsup8FYr4
 eokJHLnM6lfGzaNOnlg6sCE6Aqt9g63OFCvTIR9ylJTWvptK+ZwWqQdL9Sp0IjvI
 A5D+RGyAqRc6zWDECeKq
 =QxkI
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2016-04-25 21:11:13 +02:00
commit ccb0f688ea
2 changed files with 10 additions and 6 deletions