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

Pull ARM SoC cleanups from Arnd Bergmann:
 "These cleanup patches are mainly move stuff around and should all be
  harmless.  They are mainly split out so that other branches can be
  based on top to avoid conflicts.

  Notable changes are:

   - We finally remove all mach/timex.h, after CLOCK_TICK_RATE is no
     longer used (Uwe Kleine-König)
   - The Qualcomm MSM platform is split out into legacy mach-msm and
     new-style mach-qcom, to allow easier maintainance of the new
     hardware support without regressions (Kumar Gala)
   - A rework of some of the Kconfig logic to simplify multiplatform
     support (Rob Herring)
   - Samsung Exynos gets closer to supporting multiplatform (Sachin
     Kamat and others)
   - mach-bcm3528 gets merged into mach-bcm (Stephen Warren)
   - at91 gains some common clock framework support (Alexandre Belloni,
     Jean-Jacques Hiblot and other French people)"

* tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (89 commits)
  ARM: hisi: select HAVE_ARM_SCU only for SMP
  ARM: efm32: allow uncompress debug output
  ARM: prima2: build reset code standalone
  ARM: at91: add PWM clock
  ARM: at91: move sam9261 SoC to common clk
  ARM: at91: prepare common clk transition for sam9261 SoC
  ARM: at91: updated the at91_dt_defconfig with support for the ADS7846
  ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek
  ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCs
  ARM: at91: dt: Add at91sam9261 dt SoC support
  ARM: at91: switch sam9rl to common clock framework
  ARM: at91/dt: define main clk frequency of at91sam9rlek
  ARM: at91/dt: define at91sam9rl clocks
  ARM: at91: prepare common clk transition for sam9rl SoCs
  ARM: at91: prepare sam9 dt boards transition to common clk
  ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek
  ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCs
  ARM: at91: Add at91sam9rl DT SoC support
  ARM: at91: prepare at91sam9rl DT transition
  ARM: at91/defconfig: refresh at91sam9260_9g20_defconfig
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index 79bea0b34d1f0c561b895777d608a87c604f30f3,e4ac50ba1d5aa028813203a040a5544778c26fbe..83912d0251ca138a816f74ed77de295e7e426d2e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -423,11 -422,7 +425,8 @@@ config ARCH_EFM3
        bool "Energy Micro efm32"
        depends on !MMU
        select ARCH_REQUIRE_GPIOLIB
 +      select AUTO_ZRELADDR
        select ARM_NVIC
-       # CLKSRC_MMIO is wrong here, but needed until a proper fix is merged,
-       # i.e. CLKSRC_EFM32 selecting CLKSRC_MMIO
-       select CLKSRC_MMIO
        select CLKSRC_OF
        select COMMON_CLK
        select CPU_V7M

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/atlas6.dtsi
Simple merge

diff --cc arch/arm/boot/dts/prima2.dtsi
Simple merge

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc arch/arm/mach-ep93xx/core.c
Simple merge

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/common.c
Simple merge

diff --cc arch/arm/mach-mmp/time.c
Simple merge

diff --cc arch/arm/mach-moxart/Kconfig
index e9b45bb58263dae86cc1efa9fd13a270107e6dd8,95a6a4b43c37a611c6161f1f1564efe07cf80344..82a4ba8578a23ce5fad77bcaa63eaee8e3ac5603
--- 1/arch/arm/mach-moxart/Kconfig
--- 2/arch/arm/mach-moxart/Kconfig
+++ b/arch/arm/mach-moxart/Kconfig
@@@ -1,15 -1,10 +1,10 @@@
  config ARCH_MOXART
 -      bool "MOXA ART SoC" if ARCH_MULTI_V4T
 +      bool "MOXA ART SoC" if ARCH_MULTI_V4
        select CPU_FA526
        select ARM_DMA_MEM_BUFFERABLE
-       select USE_OF
-       select CLKSRC_OF
        select CLKSRC_MMIO
-       select HAVE_CLK
-       select COMMON_CLK
        select GENERIC_IRQ_CHIP
        select ARCH_REQUIRE_GPIOLIB
-       select GENERIC_CLOCKEVENTS
        select PHYLIB if NETDEVICES
        help
          Say Y here if you want to run your kernel on hardware with a

diff --cc arch/arm/mach-mvebu/Kconfig
Simple merge

diff --cc arch/arm/mach-mvebu/armada-370-xp.c
Simple merge

diff --cc arch/arm/mach-netx/time.c
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
index ac488251174961bf41d606f2d633ec09a55cf684,922cbd8e35197d8f5c531fa8dc10402a79a4020c..27fc52d418a5046fd6f88b11e1311a2f925e2603
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -48,13 -45,10 +43,11 @@@ config SOC_OMAP
        bool "TI OMAP5"
        depends on ARCH_MULTI_V7
        select ARCH_OMAP2PLUS
 +      select ARCH_HAS_OPP
        select ARM_CPU_SUSPEND if PM
        select ARM_GIC
-       select CPU_V7
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
-       select HAVE_SMP
        select HAVE_ARM_ARCH_TIMER
        select ARM_ERRATA_798181 if SMP
  
@@@ -62,18 -56,12 +55,14 @@@ config SOC_AM33X
        bool "TI AM33XX"
        depends on ARCH_MULTI_V7
        select ARCH_OMAP2PLUS
 +      select ARCH_HAS_OPP
        select ARM_CPU_SUSPEND if PM
-       select CPU_V7
-       select MULTI_IRQ_HANDLER
  
  config SOC_AM43XX
        bool "TI AM43x"
        depends on ARCH_MULTI_V7
-       select CPU_V7
        select ARCH_OMAP2PLUS
-       select MULTI_IRQ_HANDLER
 +      select ARCH_HAS_OPP
        select ARM_GIC
        select MACH_OMAP_GENERIC
  
@@@ -81,11 -69,8 +70,9 @@@ config SOC_DRA7X
        bool "TI DRA7XX"
        depends on ARCH_MULTI_V7
        select ARCH_OMAP2PLUS
 +      select ARCH_HAS_OPP
        select ARM_CPU_SUSPEND if PM
        select ARM_GIC
-       select CPU_V7
-       select HAVE_SMP
        select HAVE_ARM_ARCH_TIMER
  
  config ARCH_OMAP2PLUS
@@@ -102,10 -85,9 +87,8 @@@
        select MACH_OMAP_GENERIC
        select OMAP_DM_TIMER
        select PINCTRL
 -      select PROC_DEVICETREE if PROC_FS
        select SOC_BUS
-       select SPARSE_IRQ
        select TI_PRIV_EDMA
-       select USE_OF
        help
          Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
  

diff --cc arch/arm/mach-rpc/time.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/Kconfig
Simple merge

diff --cc arch/arm/mach-s3c24xx/common.c
Simple merge

diff --cc arch/arm/mach-s3c24xx/mach-gta02.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/irq-pm.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/common.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/irq-pm.c
Simple merge

diff --cc arch/arm/mach-sa1100/time.c
Simple merge

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-spear/Kconfig
index 308d5b5b3055d35f9e17011c8e4e45999c1f33ad,5c57262b97e906cee16263733de0c9275c70325b..0786249b283250041f3b7aa824d64bc85e08462f
--- 1/arch/arm/mach-spear/Kconfig
--- 2/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@@ -90,9 -81,8 +81,8 @@@ config ARCH_SPEAR6X
  config MACH_SPEAR600
        def_bool y
        depends on ARCH_SPEAR6XX
-       select USE_OF
        help
 -        Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig"
 +        Supports ST SPEAr600 boards configured via the device-tree
  
  config ARCH_SPEAR_AUTO
        def_bool PLAT_SPEAR_SINGLE

diff --cc arch/arm/mach-tegra/Kconfig
index 4926bd11f190fc259c82f0311760baaee3502bc8,f61cd5b9f103c680c656036acf9ab02188f0c4e7..92d660f9610f4ca94092a81749e578372731939f
--- 1/arch/arm/mach-tegra/Kconfig
--- 2/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -18,10 -12,9 +12,8 @@@ config ARCH_TEGR
        select ARCH_HAS_RESET_CONTROLLER
        select RESET_CONTROLLER
        select SOC_BUS
-       select SPARSE_IRQ
 -      select USB_ARCH_HAS_EHCI if USB_SUPPORT
        select USB_ULPI if USB_PHY
        select USB_ULPI_VIEWPORT if USB_PHY
-       select USE_OF
        help
          This enables support for NVIDIA Tegra based systems.
  

diff --cc arch/arm/mach-zynq/Kconfig
index f03e75bd0b2b232f9afdfbbd4ea30e5da95a0adf,105d39b72a254d2955a4e959fe6e966a8963dff7..0e001a489a794b87a958fd9468a59d3f1b813132
--- 1/arch/arm/mach-zynq/Kconfig
--- 2/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@@ -2,19 -2,10 +2,12 @@@ config ARCH_ZYN
        bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
        select ARM_AMBA
        select ARM_GIC
-       select COMMON_CLK
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
 +      select ARCH_HAS_CPUFREQ
 +      select ARCH_HAS_OPP
        select HAVE_ARM_SCU if SMP
        select HAVE_ARM_TWD if SMP
        select ICST
-       select MIGHT_HAVE_CACHE_L2X0
-       select USE_OF
-       select HAVE_SMP
-       select SPARSE_IRQ
        select CADENCE_TTC_TIMER
 -      select ARM_GLOBAL_TIMER
 +      select ARM_GLOBAL_TIMER if !CPU_FREQ
        help
          Support for Xilinx Zynq ARM Cortex A9 Platform

diff --cc arch/arm/plat-samsung/init.c
Simple merge

diff --cc drivers/clocksource/Kconfig
index 52e9329e3c51c05419a2d811ad3ed8fd271baa66,6510ec4f45ff8ac88921377a0f6d703f4325f587..96918e1f26a39bab1d14193114cbdb29f38235b8
--- 1/drivers/clocksource/Kconfig
--- 2/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -141,50 -141,5 +141,53 @@@ config VF_PIT_TIME
        help
          Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.
  
 +config SYS_SUPPORTS_SH_CMT
 +        bool
 +
 +config SYS_SUPPORTS_SH_MTU2
 +        bool
 +
 +config SYS_SUPPORTS_SH_TMU
 +        bool
 +
 +config SYS_SUPPORTS_EM_STI
 +        bool
 +
 +config SH_TIMER_CMT
 +      bool "Renesas CMT timer driver" if COMPILE_TEST
 +      depends on GENERIC_CLOCKEVENTS
 +      default SYS_SUPPORTS_SH_CMT
 +      help
 +        This enables build of a clocksource and clockevent driver for
 +        the Compare Match Timer (CMT) hardware available in 16/32/48-bit
 +        variants on a wide range of Mobile and Automotive SoCs from Renesas.
 +
 +config SH_TIMER_MTU2
 +      bool "Renesas MTU2 timer driver" if COMPILE_TEST
 +      depends on GENERIC_CLOCKEVENTS
 +      default SYS_SUPPORTS_SH_MTU2
 +      help
 +        This enables build of a clockevent driver for the Multi-Function
 +        Timer Pulse Unit 2 (TMU2) hardware available on SoCs from Renesas.
 +        This hardware comes with 16 bit-timer registers.
 +
 +config SH_TIMER_TMU
 +      bool "Renesas TMU timer driver" if COMPILE_TEST
 +      depends on GENERIC_CLOCKEVENTS
 +      default SYS_SUPPORTS_SH_TMU
 +      help
 +        This enables build of a clocksource and clockevent driver for
 +        the 32-bit Timer Unit (TMU) hardware available on a wide range
 +        SoCs from Renesas.
 +
 +config EM_TIMER_STI
 +      bool "Renesas STI timer driver" if COMPILE_TEST
 +      depends on GENERIC_CLOCKEVENTS
 +      default SYS_SUPPORTS_EM_STI
 +      help
 +        This enables build of a clocksource and clockevent driver for
 +        the 48-bit System Timer (STI) hardware available on a SoCs
 +        such as EMEV2 from former NEC Electronics.
++
+ config CLKSRC_QCOM
+       bool

diff --cc drivers/clocksource/Makefile
Simple merge

diff --cc drivers/clocksource/exynos_mct.c
Simple merge

diff --cc drivers/irqchip/irq-mmp.c
Simple merge

diff --cc drivers/tty/serial/atmel_serial.c
Simple merge