Merge tag 'for-3.16/bcm-soc' of git://github.com/broadcom/mach-bcm into next/soc

Merge "mach-bcm 3.16 soc updates" From Matt Porter:

* only show ARCH_BCM in multi v6/v7 configs
* enable ARM erratum 775420
* bcm_defconfig updates for pwm

* tag 'for-3.16/bcm-soc' of git://github.com/broadcom/mach-bcm:
  ARM: bcm_defconfig: Enable PWM and Backlight
  ARM: mach-bcm: add ARM_ERRATA_775420
  ARM: bcm: Restrict ARCH_BCM selection to ARCH_MULTI_V6_V7

Signed-off-by: Arnd Bergmann <[email protected]>

diff --combined arch/arm/mach-bcm/Kconfig
index b8cc9e8992f1ba23ccc0c8bc106db7746bc9b5fd,daead394b75c6d1d739fb7e8761f51565c6e6082..1c73a7c55418f525a05bf15902be3d0f7662b17e
--- 1/arch/arm/mach-bcm/Kconfig
--- 2/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@@ -1,19 -1,18 +1,17 @@@
  config ARCH_BCM
-       bool "Broadcom SoC Support"
-       depends on ARCH_MULTIPLATFORM
+       bool "Broadcom SoC Support" if ARCH_MULTI_V6_V7
        help
-         This enables support for Broadcom ARM based SoC
-           chips
- 
- if ARCH_BCM
+         This enables support for Broadcom ARM based SoC chips
  
  menu "Broadcom SoC Selection"
+       depends on ARCH_BCM
  
  config ARCH_BCM_MOBILE
        bool "Broadcom Mobile SoC Support" if ARCH_MULTI_V7
 -      depends on MMU
        select ARCH_REQUIRE_GPIOLIB
        select ARM_ERRATA_754322
        select ARM_ERRATA_764369 if SMP
+       select ARM_ERRATA_775420
        select ARM_GIC
        select GPIO_BCM_KONA
        select TICK_ONESHOT
@@@ -62,7 -61,10 +60,7 @@@ config ARCH_BCM283
        select ARM_AMBA
        select ARM_ERRATA_411920
        select ARM_TIMER_SP804
 -      select CLKDEV_LOOKUP
        select CLKSRC_OF
 -      select CPU_V6
 -      select GENERIC_CLOCKEVENTS
        select PINCTRL
        select PINCTRL_BCM2835
        help
@@@ -71,10 -73,14 +69,10 @@@
  
  config ARCH_BCM_5301X
        bool "Broadcom BCM470X / BCM5301X ARM SoC" if ARCH_MULTI_V7
 -      depends on MMU
        select ARM_GIC
        select CACHE_L2X0
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
 -      select HAVE_SMP
 -      select COMMON_CLK
 -      select GENERIC_CLOCKEVENTS
        select ARM_GLOBAL_TIMER
        select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
        select MIGHT_HAVE_PCI
@@@ -92,5 -98,3 +90,3 @@@
          network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
  
  endmenu
- 
- endif