• Olof Johansson's avatar
    Merge tag 'imx-soc-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc · 1760e4f8
    Olof Johansson authored
    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
      ...
    1760e4f8
io.c 17.4 KB