Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC platform changes from Olof Johansson:
 "New core SoC-specific changes.

  New platforms:
   * Introduction of a vendor, Hisilicon, and one of their SoCs with
     some random numerical product name.
   * Introduction of EFM32, embedded platform from Silicon Labs (ARMv7m,
     i.e. !MMU).
   * Marvell Berlin series of SoCs, which include the one in Chromecast.
   * MOXA platform support, ARM9-based platform used mostly in
     industrial products
   * Support for Freescale's i.MX50 SoC.

  Other work:
   * Renesas work for new platforms and drivers, and conversion over to
     more multiplatform-friendly device registration schemes.
   * SMP support for Allwinner sunxi platforms.
   * ... plus a bunch of other stuff across various platforms"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (201 commits)
  ARM: tegra: fix tegra_powergate_sequence_power_up() inline
  ARM: msm_defconfig: Update for multi-platform
  ARM: msm: Move MSM's DT based hardware to multi-platform support
  ARM: msm: Only build timer.c if required
  ARM: msm: Only build clock.c on proc_comm based platforms
  ARM: ux500: Enable system suspend with WFI support
  ARM: ux500: turn on PRINTK_TIME in u8500_defconfig
  ARM: shmobile: r8a7790: Fix I2C controller names
  ARM: msm: Simplify ARCH_MSM_DT config
  ARM: msm: Add support for MSM8974 SoC
  ARM: sunxi: select ARM_PSCI
  MAINTAINERS: Update Allwinner sunXi maintainer files
  ARM: sunxi: Select RESET_CONTROLLER
  ARM: imx: improve the comment of CCM lpm SW workaround
  ARM: imx: improve status check of clock gate
  ARM: imx: add necessary interface for pfd
  ARM: imx_v6_v7_defconfig: Select CONFIG_REGULATOR_PFUZE100
  ARM: imx_v6_v7_defconfig: Select MX35 and MX50 device tree support
  ARM: imx: Add cpu frequency scaling support
  ARM i.MX35: Add devicetree support.
  ...

1 files changed, 48 insertions, 26 deletions

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 2586c2865874..9625cf378931 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1,12 +1,50 @@
+config ARCH_MSM
+        bool
+
+config ARCH_MSM_DT
+        bool "Qualcomm MSM DT Support" if ARCH_MULTI_V7
+        select ARCH_MSM
+        select ARCH_REQUIRE_GPIOLIB
+        select CLKSRC_OF
+        select GENERIC_CLOCKEVENTS
+        help
+          Support for Qualcomm's devicetree based MSM systems.
+
 if ARCH_MSM
 
-comment "Qualcomm MSM SoC Type"
+menu "Qualcomm MSM SoC Selection"
         depends on ARCH_MSM_DT
 
+config ARCH_MSM8X60
+        bool "Enable support for MSM8X60"
+        select ARM_GIC
+        select CPU_V7
+        select HAVE_SMP
+        select MSM_SCM if SMP
+        select MSM_TIMER
+
+config ARCH_MSM8960
+        bool "Enable support for MSM8960"
+        select ARM_GIC
+        select CPU_V7
+        select HAVE_SMP
+        select MSM_SCM if SMP
+        select MSM_TIMER
+
+config ARCH_MSM8974
+        bool "Enable support for MSM8974"
+        select ARM_GIC
+        select CPU_V7
+        select HAVE_ARM_ARCH_TIMER
+        select HAVE_SMP
+        select MSM_SCM if SMP
+
+endmenu
+
 choice
         prompt "Qualcomm MSM SoC Type"
         default ARCH_MSM7X00A
-        depends on !ARCH_MSM_DT
+        depends on ARCH_MSM_NODT
 
 config ARCH_MSM7X00A
         bool "MSM7x00A / MSM7x01A"
@@ -16,6 +54,7 @@ config ARCH_MSM7X00A
         select MACH_TROUT if !MACH_HALIBUT
         select MSM_PROC_COMM
         select MSM_SMD
+        select MSM_TIMER
         select MSM_SMD_PKG3
 
 config ARCH_MSM7X30
@@ -27,6 +66,7 @@ config ARCH_MSM7X30
         select MSM_GPIOMUX
         select MSM_PROC_COMM
         select MSM_SMD
+        select MSM_TIMER
         select MSM_VIC
 
 config ARCH_QSD8X50
@@ -38,32 +78,11 @@ config ARCH_QSD8X50
         select MSM_GPIOMUX
         select MSM_PROC_COMM
         select MSM_SMD
+        select MSM_TIMER
         select MSM_VIC
 
 endchoice
 
-config ARCH_MSM8X60
-        bool "MSM8X60"
-        select ARM_GIC
-        select CPU_V7
-        select GPIO_MSM_V2
-        select HAVE_SMP
-        select MSM_SCM if SMP
-
-config ARCH_MSM8960
-        bool "MSM8960"
-        select ARM_GIC
-        select CPU_V7
-        select HAVE_SMP
-        select GPIO_MSM_V2
-        select MSM_SCM if SMP
-
-config ARCH_MSM_DT
-        def_bool y
-        depends on (ARCH_MSM8X60 || ARCH_MSM8960)
-        select SPARSE_IRQ
-        select USE_OF
-
 config MSM_HAS_DEBUG_UART_HS
         bool
 
@@ -80,7 +99,7 @@ config  MSM_VIC
         bool
 
 menu "Qualcomm MSM Board Type"
-        depends on !ARCH_MSM_DT
+        depends on ARCH_MSM_NODT
 
 config MACH_HALIBUT
         depends on ARCH_MSM
@@ -128,10 +147,13 @@ config MSM_SMD
 
 config MSM_GPIOMUX
         bool
-        depends on !ARCH_MSM_DT
         help
           Support for MSM V1 TLMM GPIOMUX architecture.
 
 config MSM_SCM
         bool
+
+config MSM_TIMER
+        bool
+
 endif