Merge branch 'cleanup/kconfig' into next/soc

Bring in the cleanup branch due to conflicts in new additions. Should really
have been the base before the other branch, but this way works too.

* cleanup/kconfig:
  ARM: qcom: clean-up unneeded kconfig selects
  ARM: bcm: clean-up unneeded kconfig selects
  ARM: mvebu: clean-up unneeded kconfig selects

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-mvebu/Kconfig
index d6b0a772a6dd2e94cbb4d82b0e281672ba8d46fb,bfc5af18e4839acf13cf4fd88030bfbb378b1215..199187e474ce524600922a4d46fd5c41a537711d
--- 1/arch/arm/mach-mvebu/Kconfig
--- 2/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -3,10 -3,8 +3,9 @@@ config ARCH_MVEB
        select ARCH_SUPPORTS_BIG_ENDIAN
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
-       select IRQ_DOMAIN
        select PINCTRL
        select PLAT_ORION
 +      select SOC_BUS
        select MVEBU_MBUS
        select ZONE_DMA if ARM_LPAE
        select ARCH_REQUIRE_GPIOLIB
@@@ -39,10 -36,6 +37,9 @@@ config MACH_ARMADA_37
        select ARM_ERRATA_753970
        select ARM_GIC
        select ARMADA_375_CLK
-       select CPU_V7
 +      select HAVE_ARM_SCU
 +      select HAVE_ARM_TWD if SMP
 +      select HAVE_SMP
        select MACH_MVEBU_V7
        select PINCTRL_ARMADA_375
        help
@@@ -55,10 -48,6 +52,9 @@@ config MACH_ARMADA_38
        select ARM_ERRATA_753970
        select ARM_GIC
        select ARMADA_38X_CLK
-       select CPU_V7
 +      select HAVE_ARM_SCU
 +      select HAVE_ARM_TWD if SMP
 +      select HAVE_SMP
        select MACH_MVEBU_V7
        select PINCTRL_ARMADA_38X
        help