From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 26 Feb 2016 22:34:17 +0000 (+0100)
Subject: Merge tag 'arm-soc/for-4.6/defconfig' of http://github.com/Broadcom/stblinux into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ba923b5ee626d42868b38532c778045661ff67d1;p=linux-beck.git

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

Merge "Broadcom defconfig changes for 4.6" from Florian Fainelli:

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

- Daniel enables all that is required to get the BCM283x (Raspberry Pi and
  Raspberry Pi 2) SoCs to boot with multi_v7_defconfig

- Stefan enables the Raspberry Pi firmware driver and power domain drivers
  in bcm2835_defconfig

- Stephen refreshes the bcm2835_defconfig, disables DEBUG_LL, and turns on
  ARMv7 support which is needed for BCM2836 (Raspberry Pi 2)

* tag 'arm-soc/for-4.6/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Enable BCM283x
  ARM: bcm2835_defconfig: Enable RPi power domain driver
  ARM: bcm2835_defconfig: Enable RPi firmware driver
  ARM: bcm2835_defconfig: enable ARMv7 support
  ARM: bcm2835_defconfig: disable DEBUG_LL
  ARM: bcm2835_defconfig: rebuild on next-20160205
---

ba923b5ee626d42868b38532c778045661ff67d1
diff --cc arch/arm/configs/multi_v7_defconfig
index c86d50607a32,3a003a3ab398..d5b4847a37b9
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -757,9 -757,9 +765,10 @@@ CONFIG_IIO=
  CONFIG_AT91_ADC=m
  CONFIG_BERLIN2_ADC=m
  CONFIG_EXYNOS_ADC=m
 +CONFIG_VF610_ADC=m
  CONFIG_XILINX_XADC=y
  CONFIG_AK8975=y
+ CONFIG_RASPBERRYPI_POWER=y
  CONFIG_PWM=y
  CONFIG_PWM_ATMEL=m
  CONFIG_PWM_ATMEL_TCB=m