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 ...
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-tty 1 addition, 2 deletionsDocumentation/ABI/testing/sysfs-tty
- Documentation/PCI/MSI-HOWTO.txt 109 additions, 10 deletionsDocumentation/PCI/MSI-HOWTO.txt
- Documentation/devicetree/bindings/arm/omap/omap.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/arm/omap/omap.txt
- Documentation/devicetree/bindings/bus/imx-weim.txt 27 additions, 1 deletionDocumentation/devicetree/bindings/bus/imx-weim.txt
- Documentation/devicetree/bindings/net/sti-dwmac.txt 58 additions, 0 deletionsDocumentation/devicetree/bindings/net/sti-dwmac.txt
- Documentation/networking/3c505.txt 0 additions, 45 deletionsDocumentation/networking/3c505.txt
- MAINTAINERS 14 additions, 1 deletionMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/Kconfig 12 additions, 3 deletionsarch/arm/Kconfig
- arch/arm/Makefile 0 additions, 1 deletionarch/arm/Makefile
- arch/arm/boot/dts/Makefile 2 additions, 1 deletionarch/arm/boot/dts/Makefile
- arch/arm/boot/dts/am335x-evmsk.dts 10 additions, 1 deletionarch/arm/boot/dts/am335x-evmsk.dts
- arch/arm/boot/dts/armada-xp-mv78260.dtsi 2 additions, 1 deletionarch/arm/boot/dts/armada-xp-mv78260.dtsi
- arch/arm/boot/dts/dove.dtsi 0 additions, 11 deletionsarch/arm/boot/dts/dove.dtsi
- arch/arm/boot/dts/imx6dl-hummingboard.dts 3 additions, 7 deletionsarch/arm/boot/dts/imx6dl-hummingboard.dts
- arch/arm/boot/dts/imx6qdl-cubox-i.dtsi 3 additions, 7 deletionsarch/arm/boot/dts/imx6qdl-cubox-i.dtsi
- arch/arm/boot/dts/omap3-gta04.dts 4 additions, 2 deletionsarch/arm/boot/dts/omap3-gta04.dts
- arch/arm/boot/dts/omap3-n9.dts 1 addition, 1 deletionarch/arm/boot/dts/omap3-n9.dts
- arch/arm/boot/dts/omap3-n900.dts 2 additions, 2 deletionsarch/arm/boot/dts/omap3-n900.dts
- arch/arm/boot/dts/omap3-n950.dts 1 addition, 1 deletionarch/arm/boot/dts/omap3-n950.dts
Loading
Please register or sign in to comment