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 <arnd@arndb.de>

1 files changed, 4 insertions, 8 deletions

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index b8cc9e8992f1..1c73a7c55418 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -1,19 +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
         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
@@ -92,5 +90,3 @@ config ARCH_BCM_5301X
           network SoC using a MIPS CPU, they are supported by arch/mips/bcm47xx
 
 endmenu
-
-endif