From: Olof Johansson <olof@lixom.net>
Date: Sun, 9 Mar 2014 19:03:18 +0000 (-0700)
Subject: Merge tag 'imx-soc-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc
X-Git-Tag: firefly_0821_release~176^2~4133^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1760e4f855a2ead08a40deac9abd4fb8cdf3af32;p=firefly-linux-kernel-4.4.55.git

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
  ...
---

1760e4f855a2ead08a40deac9abd4fb8cdf3af32
diff --cc arch/arm/mach-mvebu/Kconfig
index 884b275ab056,875a35263dc3..f961ae4ec4ee
--- a/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 40fd5c31b594,eec053c62fa0..e55ae63bb030
--- a/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-rockchip/Kconfig
index 133410e178a7,6b2f58645a73..1caee6d548b8
--- a/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