Merge tag 'imx-soc-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

i.MX SoC changes for 3.15 from Shawn Guo:
 - Support suspend from ocram (DDR IO floating) for imx6 platforms
 - Add cpuidle support for imx6sl
 - Sparse warning fixes for imx6sl and vf610 clock code
 - Remove PWM platform code
 - Support ptp and rmii clock from pad
 - Support WEIM CS GPR configuration
 - Random cleanups and defconfig updates

* tag 'imx-soc-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6: (373 commits)
  ARM: imx6: drop .text.head section annotation from headsmp.S
  ARM: imx6: build suspend-imx6.o with CONFIG_SOC_IMX6
  ARM: imx6: rename pm-imx6q.c to pm-imx6.c
  ARM: imx6: introduce CONFIG_SOC_IMX6 for i.MX6 common stuff
  ARM: imx6: do not call imx6q_suspend_init() with !CONFIG_SUSPEND
  ARM: imx6: call suspend_set_ops() from suspend routine
  ARM: imx6: build headsmp.o only on CONFIG_SMP
  ARM: imx6: move v7_cpu_resume() into suspend-imx6.S
  ARM i.MX6q: Mark VPU and IPU AXI transfers as cacheable, increase IPU priority
  ARM: imx6q: Add GPR6 and GPR7 register definitions for iomuxc gpr
  bus: imx-weim: support CS GPR configuration
  ARM: mach-imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX2_WDT from SOC_IMX53
  ARM: imx_v6_v7_defconfig: Select CONFIG_DEBUG_FS
  ARM: mach-imx: Select CONFIG_SRAM at ARCH_MXC level
  ARM: imx: add speed grading check for i.mx6 soc
  ARM: imx: avoid calling clk APIs in idle thread which may cause schedule
  ARM: imx6q: support ptp and rmii clock from pad
  ARM: imx6q: remove unneeded clk lookups
  ARM: imx_v6_v7_defconfig: Select CONFIG_MMC_UNSAFE_RESUME
  ARM: imx_v4_v5_defconfig: Select CONFIG_MMC_UNSAFE_RESUME
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

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

diff --cc arch/arm/mach-mvebu/Kconfig
index 884b275ab0567fda435cee31729c5b889360a4ed,875a35263dc3e78df6465d661ee5ad56288c8c54..f961ae4ec4ee8e1e08d56f07f842de2b6c9120c2
--- 1/arch/arm/mach-mvebu/Kconfig
--- 2/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -21,11 -16,11 +16,10 @@@ if ARCH_MVEB
  
  menu "Marvell SOC with device tree"
  
 -config MACH_ARMADA_370_XP
 +config MACH_MVEBU_V7
        bool
        select ARMADA_370_XP_TIMER
-       select HAVE_SMP
        select CACHE_L2X0
 -      select CPU_PJ4B
  
  config MACH_ARMADA_370
        bool "Marvell Armada 370 boards"

diff --cc arch/arm/mach-omap2/Kconfig
index 40fd5c31b594991587d98a31af4b12add96f7e32,eec053c62fa0ec05f49f676f7e945e71bdd1a26d..e55ae63bb030bf1fd340f1aa25972a930521e250
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -275,9 -265,9 +259,8 @@@ config MACH_NOKIA_N8X
        bool "Nokia N800/N810"
        depends on SOC_OMAP2420
        default y
-       select MACH_NOKIA_N800
        select MACH_NOKIA_N810
        select MACH_NOKIA_N810_WIMAX
 -      select OMAP_PACKAGE_ZAC
  
  config MACH_NOKIA_RX51
        bool "Nokia N900 (RX-51) phone"

diff --cc arch/arm/mach-omap2/io.c
Simple merge

diff --cc arch/arm/mach-rockchip/Kconfig
index 133410e178a7f183f5972655562f8e7335393308,6b2f58645a73091677df7069527d5121b08e3bae..1caee6d548b84387107e251132a2302a59c48c1a
--- 1/arch/arm/mach-rockchip/Kconfig
--- 2/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@@ -5,11 -5,7 +5,8 @@@ config ARCH_ROCKCHI
        select ARCH_REQUIRE_GPIOLIB
        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 DW_APB_TIMER_OF
        select ARM_GLOBAL_TIMER
        select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK