Merge branch 'bcm/cleanup' into next/soc

Conflicts:
	arch/arm/mach-bcm/Kconfig

diff --combined arch/arm/mach-bcm/Kconfig
index 9f19636fea2f656392c84fdff74f08e909db14ca,28f90a01e3acbe585e8550ccc61773027a8dd643..b8cc9e8992f1ba23ccc0c8bc106db7746bc9b5fd
--- 1/arch/arm/mach-bcm/Kconfig
--- 2/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@@ -10,21 -10,52 +10,51 @@@ if ARCH_BC
  menu "Broadcom SoC Selection"
  
  config ARCH_BCM_MOBILE
-       bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
+       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_GIC
        select GPIO_BCM_KONA
        select TICK_ONESHOT
-       select CACHE_L2X0
        select HAVE_ARM_ARCH_TIMER
        select PINCTRL
        help
          This enables support for systems based on Broadcom mobile SoCs.
-         It currently supports the 'BCM281XX' family, which includes
-         BCM11130, BCM11140, BCM11351, BCM28145 and
-         BCM28155 variants.
+ 
+ if ARCH_BCM_MOBILE
+ 
+ menu "Broadcom Mobile SoC Selection"
+ 
+ config ARCH_BCM_281XX
+       bool "Broadcom BCM281XX SoC family"
+       default y
+       help
+         Enable support for the the BCM281XX family, which includes
+         BCM11130, BCM11140, BCM11351, BCM28145 and BCM28155
+         variants.
+ 
+ config ARCH_BCM_21664
+       bool "Broadcom BCM21664 SoC family"
+       default y
+       help
+         Enable support for the the BCM21664 family, which includes
+         BCM21663 and BCM21664 variants.
+ 
+ config ARCH_BCM_MOBILE_L2_CACHE
+       bool "Broadcom mobile SoC level 2 cache support"
+       depends on (ARCH_BCM_281XX || ARCH_BCM_21664)
+       default y
+       select CACHE_L2X0
+       select ARCH_BCM_MOBILE_SMC
+ 
+ config ARCH_BCM_MOBILE_SMC
+       bool
+       depends on ARCH_BCM_281XX || ARCH_BCM_21664
+ 
+ endmenu
+ 
+ endif
  
  config ARCH_BCM2835
        bool "Broadcom BCM2835 family" if ARCH_MULTI_V6
@@@ -32,7 -63,10 +62,7 @@@
        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
@@@ -41,10 -75,14 +71,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