This pull request contains Broadcom ARM-based SoCs defconfig updates for 4.12,

please pull the following:
 
 - Gerd enables the BCM2835 MMC driver which yields better performance than the
   default one (iProc)
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJY1VYTAAoJEIfQlpxEBwcEDFEQALMGsJbpByPosCKn5SNCiXlA
 QqQU4TuE2SNC5C/OVDyFeWXbDOa0AEu35Pi/y87vm4k1hfpAyOSqBY9JY/IG0C1p
 yd+4Gbi8l1VtY4/4XJntaPmyaJ3Vk0ftL4/La6eTkJPQ/4Z8s79Jses41VQmVzZ/
 tuhn7rQ3exFVOOgkpDfrC1mruHrIqx+97ASwea7ONhTfNVUSmdY8MoHJ71YvWms2
 ZUIYq0Dmt58dEnE9h5UoWlf29Ib0L4HQ0GCc+CaO7tQ2fE4YpllT4x4p/PiQnR3t
 XTE1KaT1aGOGDYzPoDJNjGk3+/I0fJXCuPX3kZis1nbUR9rFKDhNQcVF64YGaNQX
 Y3DIvcx7v1zd6eEOt6QzckQgIXmfYSLLsvv/V22ev+H6m/oYPJSnD/5W2uCGbXVu
 5UYggVEC7JPhFcprvskOpV10EW4ewzC2XKKxgll21GTqu8Pkt9Qgo65gpz2pVqGa
 UAygdt7shFHQ/4ZHaZt2IYaBXDOwIZjp2M9pUp2KzKn2NuvieBR3A2M03vyJIQ04
 KqDy4G0Sc6r5Sk6zOYZ7j3zpteqHDENpkuJ1OembnOoF49GO3CCKpyqZ1utKuMSF
 UCjFHey4RcS98ZMK/e60WIS4tSr5uk2uOfRpvDGrw3ctbbD0sqZzlnEhCFTXhEwy
 iMRCbqgMGUlOCaV2h0gN
 =lxDs
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.12/defconfig' of http://github.com/Broadcom/stblinux into next/defconfig

Pull "Broadcom defconfig changes for 4.12" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoCs defconfig updates for 4.12,
please pull the following:

- Gerd enables the BCM2835 MMC driver which yields better performance than the
  default one (iProc)

* tag 'arm-soc/for-4.12/defconfig' of http://github.com/Broadcom/stblinux:
  arm: set CONFIG_MMC_BCM2835=y in bcm2835_defconfig and multi_v7_defconfig
  ARM: bcm2835: Enable missing CMA settings for VC4 driver

arch/arm/configs/bcm2835_defconfig

@@ -1,6 +1,5 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
-CONFIG_FHANDLE=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BSD_PROCESS_ACCT=y
@@ -32,6 +31,7 @@ CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
 CONFIG_KSM=y
 CONFIG_CLEANCACHE=y
+CONFIG_CMA=y
 CONFIG_SECCOMP=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
@@ -52,6 +52,7 @@ CONFIG_MAC80211=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
+CONFIG_DMA_CMA=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_CONSTANTS=y
@@ -62,7 +63,6 @@ CONFIG_USB_NET_SMSC95XX=y
 CONFIG_ZD1211RW=y
 CONFIG_INPUT_EVDEV=y
 # CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_TTY_PRINTK=y
@@ -92,6 +92,7 @@ CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_IPROC=y
+CONFIG_MMC_BCM2835=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y

arch/arm/configs/multi_v7_defconfig

@@ -730,6 +730,7 @@ CONFIG_MMC_DW_EXYNOS=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SH_MMCIF=y
 CONFIG_MMC_SUNXI=y
+CONFIG_MMC_BCM2835=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=m