Commit aac59e3efce3dca787b11e34726001603ce3d161
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform changes from Olof Johansson: "New and updated SoC support. Among the things new for this release are: - More support for the AM33xx platforms from TI - Tegra 124 support, and some updates to older tegra families as well - imx cleanups and updates across the board - A rename of Broadcom's Mobile platforms which were introduced as ARCH_BCM, and turned out to be too broad a name. New name is ARCH_BCM_MOBILE. - A whole bunch of updates and fixes for integrator, making the platform code more modern and switches over to DT-only booting. - Support for two new Renesas shmobile chipsets. Next up for them is more work on consolidation instead of introduction of new non-multiplatform SoCs, we're all looking forward to that! - Misc cleanups for older Samsung platforms, some Allwinner updates, etc" * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (159 commits) ARM: bcm281xx: Add ARCH_BCM_MOBILE to bcm config ARM: bcm_defconfig: Run "make savedefconfig" ARM: bcm281xx: Add ARCH Timers to config rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm) ARM: vexpress: Enable platform-specific options in defconfig ARM: vexpress: Make defconfig work again ARM: sunxi: remove .init_time hooks ARM: imx: enable suspend for imx6sl ARM: imx: ensure dsm_request signal is not asserted when setting LPM ARM: imx6q: call WB and RBC configuration from imx6q_pm_enter() ARM: imx6q: move low-power code out of clock driver ARM: imx: drop extern with function prototypes in common.h ARM: imx: reset core along with enable/disable operation ARM: imx: do not return from imx_cpu_die() call ARM: imx_v6_v7_defconfig: Select CONFIG_PROVE_LOCKING ARM: imx_v6_v7_defconfig: Enable LEDS_GPIO related options ARM: mxs_defconfig: Turn off CONFIG_DEBUG_GPIO ARM: imx: replace imx6q_restart() with mxc_restart() ARM: mach-imx: mm-imx5: Retrieve iomuxc base address from dt ARM: mach-imx: mm-imx5: Retrieve tzic base address from dt ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 190 changed files Side-by-side Diff
- Documentation/arm/Marvell/README
- Documentation/arm/sunxi/README
- Documentation/devicetree/bindings/arm/arm-boards
- Documentation/devicetree/bindings/clock/imx6q-clock.txt
- Documentation/devicetree/bindings/clock/sunxi.txt
- Documentation/devicetree/bindings/clock/sunxi/sun4i-a10-gates.txt
- Documentation/devicetree/bindings/clock/sunxi/sun5i-a10s-gates.txt
- Documentation/devicetree/bindings/clock/sunxi/sun5i-a13-gates.txt
- Documentation/devicetree/bindings/clock/sunxi/sun6i-a31-gates.txt
- Documentation/devicetree/bindings/clock/sunxi/sun7i-a20-gates.txt
- Documentation/devicetree/bindings/interrupt-controller/allwinner,sun4i-ic.txt
- Documentation/devicetree/bindings/interrupt-controller/sunxi/sun4i-a10.txt
- Documentation/devicetree/bindings/interrupt-controller/sunxi/sun5i-a13.txt
- arch/arm/Kconfig
- arch/arm/Kconfig.debug
- arch/arm/boot/dts/ecx-common.dtsi
- arch/arm/boot/dts/imx6sl.dtsi
- arch/arm/boot/dts/integrator.dtsi
- arch/arm/boot/dts/integratorap.dts
- arch/arm/boot/dts/integratorcp.dts
- arch/arm/boot/dts/keystone-clocks.dtsi
- arch/arm/boot/dts/keystone.dts
- arch/arm/boot/dts/r7s72100.dtsi
- arch/arm/boot/dts/r8a7791.dtsi
- arch/arm/configs/bcm_defconfig
- arch/arm/configs/imx_v6_v7_defconfig
- arch/arm/configs/integrator_defconfig
- arch/arm/configs/keystone_defconfig
- arch/arm/configs/multi_v7_defconfig
- arch/arm/configs/mxs_defconfig
- arch/arm/configs/sunxi_defconfig
- arch/arm/configs/vexpress_defconfig
- arch/arm/include/debug/vf.S
- arch/arm/kernel/psci_smp.c
- arch/arm/mach-bcm/Kconfig
- arch/arm/mach-bcm/Makefile
- arch/arm/mach-bcm/board_bcm281xx.c
- arch/arm/mach-davinci/board-da830-evm.c
- arch/arm/mach-davinci/board-omapl138-hawk.c
- arch/arm/mach-davinci/time.c
- arch/arm/mach-highbank/Kconfig
- arch/arm/mach-highbank/Makefile
- arch/arm/mach-highbank/core.h
- arch/arm/mach-highbank/highbank.c
- arch/arm/mach-highbank/hotplug.c
- arch/arm/mach-highbank/platsmp.c
- arch/arm/mach-highbank/pm.c
- arch/arm/mach-imx/Kconfig
- arch/arm/mach-imx/Makefile
- arch/arm/mach-imx/anatop.c
- arch/arm/mach-imx/clk-imx51-imx53.c
- arch/arm/mach-imx/clk-imx6q.c
- arch/arm/mach-imx/clk-imx6sl.c
- arch/arm/mach-imx/common.h
- arch/arm/mach-imx/cpu.c
- arch/arm/mach-imx/epit.c
- arch/arm/mach-imx/gpc.c
- arch/arm/mach-imx/hotplug.c
- arch/arm/mach-imx/mach-armadillo5x0.c
- arch/arm/mach-imx/mach-imx6q.c
- arch/arm/mach-imx/mach-imx6sl.c
- arch/arm/mach-imx/mach-mx31_3ds.c
- arch/arm/mach-imx/mach-pcm037.c
- arch/arm/mach-imx/mm-imx5.c
- arch/arm/mach-imx/mx31lilly-db.c
- arch/arm/mach-imx/mxc.h
- arch/arm/mach-imx/pm-imx6q.c
- arch/arm/mach-imx/src.c
- arch/arm/mach-imx/system.c
- arch/arm/mach-imx/time.c
- arch/arm/mach-integrator/cm.h
- arch/arm/mach-integrator/core.c
- arch/arm/mach-integrator/include/mach/cm.h
- arch/arm/mach-integrator/include/mach/irqs.h
- arch/arm/mach-integrator/integrator_ap.c
- arch/arm/mach-integrator/integrator_cp.c
- arch/arm/mach-integrator/leds.c
- arch/arm/mach-integrator/pci_v3.c
- arch/arm/mach-keystone/Kconfig
- arch/arm/mach-keystone/Makefile
- arch/arm/mach-keystone/pm_domain.c
- arch/arm/mach-kirkwood/Makefile
- arch/arm/mach-kirkwood/board-dt.c
- arch/arm/mach-kirkwood/common.c
- arch/arm/mach-kirkwood/common.h
- arch/arm/mach-kirkwood/include/mach/bridge-regs.h
- arch/arm/mach-kirkwood/pm.c
- arch/arm/mach-omap2/Makefile
- arch/arm/mach-omap2/clockdomain.h
- arch/arm/mach-omap2/clockdomains43xx_data.c
- arch/arm/mach-omap2/cm33xx.c
- arch/arm/mach-omap2/cm33xx.h
- arch/arm/mach-omap2/cminst44xx.c
- arch/arm/mach-omap2/cminst44xx.h
- arch/arm/mach-omap2/id.c
- arch/arm/mach-omap2/io.c
- arch/arm/mach-omap2/omap-secure.h
- arch/arm/mach-omap2/omap-smp.c
- arch/arm/mach-omap2/omap_hwmod.c
- arch/arm/mach-omap2/omap_hwmod.h
- arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h
- arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
- arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
- arch/arm/mach-omap2/omap_hwmod_33xx_data.c
- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
- arch/arm/mach-omap2/omap_hwmod_43xx_data.c
- arch/arm/mach-omap2/omap_hwmod_44xx_data.c
- arch/arm/mach-omap2/omap_hwmod_54xx_data.c
- arch/arm/mach-omap2/powerdomain.h
- arch/arm/mach-omap2/powerdomains43xx_data.c
- arch/arm/mach-omap2/prcm43xx.h
- arch/arm/mach-omap2/soc.h
- arch/arm/mach-omap2/timer.c
- arch/arm/mach-s3c64xx/Makefile
- arch/arm/mach-s3c64xx/clock.c
- arch/arm/mach-s3c64xx/common.c
- arch/arm/mach-s3c64xx/common.h
- arch/arm/mach-s3c64xx/dma.c
- arch/arm/mach-s3c64xx/include/mach/regs-clock.h
- arch/arm/mach-s3c64xx/mach-anw6410.c
- arch/arm/mach-s3c64xx/mach-crag6410.c
- arch/arm/mach-s3c64xx/mach-hmt.c
- arch/arm/mach-s3c64xx/mach-mini6410.c
- arch/arm/mach-s3c64xx/mach-ncp.c
- arch/arm/mach-s3c64xx/mach-smartq.c
- arch/arm/mach-s3c64xx/mach-smdk6400.c
- arch/arm/mach-s3c64xx/mach-smdk6410.c
- arch/arm/mach-s3c64xx/pm.c
- arch/arm/mach-s3c64xx/s3c6400.c
- arch/arm/mach-s3c64xx/s3c6410.c
- arch/arm/mach-shmobile/Kconfig
- arch/arm/mach-shmobile/Makefile
- arch/arm/mach-shmobile/board-lager-reference.c
- arch/arm/mach-shmobile/board-lager.c
- arch/arm/mach-shmobile/clock-r7s72100.c
- arch/arm/mach-shmobile/clock-r8a73a4.c
- arch/arm/mach-shmobile/clock-r8a7778.c
- arch/arm/mach-shmobile/clock-r8a7779.c
- arch/arm/mach-shmobile/clock-r8a7790.c
- arch/arm/mach-shmobile/clock-r8a7791.c
- arch/arm/mach-shmobile/headsmp.S
- arch/arm/mach-shmobile/include/mach/common.h
- arch/arm/mach-shmobile/include/mach/r7s72100.h
- arch/arm/mach-shmobile/include/mach/r8a73a4.h
- arch/arm/mach-shmobile/include/mach/r8a7778.h
- arch/arm/mach-shmobile/include/mach/r8a7779.h
- arch/arm/mach-shmobile/include/mach/r8a7790.h
- arch/arm/mach-shmobile/include/mach/r8a7791.h
- arch/arm/mach-shmobile/include/mach/rcar-gen2.h
- arch/arm/mach-shmobile/platsmp-apmu.c
- arch/arm/mach-shmobile/platsmp-scu.c
- arch/arm/mach-shmobile/platsmp.c
- arch/arm/mach-shmobile/setup-r7s72100.c
- arch/arm/mach-shmobile/setup-r8a73a4.c
- arch/arm/mach-shmobile/setup-r8a7778.c
- arch/arm/mach-shmobile/setup-r8a7779.c
- arch/arm/mach-shmobile/setup-r8a7790.c
- arch/arm/mach-shmobile/setup-r8a7791.c
- arch/arm/mach-shmobile/setup-rcar-gen2.c
- arch/arm/mach-shmobile/smp-emev2.c
- arch/arm/mach-shmobile/smp-r8a7779.c
- arch/arm/mach-shmobile/smp-r8a7790.c
- arch/arm/mach-shmobile/smp-r8a7791.c
- arch/arm/mach-shmobile/smp-sh73a0.c
- arch/arm/mach-sunxi/Kconfig
- arch/arm/mach-sunxi/sunxi.c
- arch/arm/mach-tegra/Kconfig
- arch/arm/mach-tegra/Makefile
- arch/arm/mach-tegra/cpuidle.c
- arch/arm/mach-tegra/flowctrl.c
- arch/arm/mach-tegra/fuse.c
- arch/arm/mach-tegra/fuse.h
- arch/arm/mach-tegra/hotplug.c
- arch/arm/mach-tegra/iomap.h
- arch/arm/mach-tegra/platsmp.c
- arch/arm/mach-tegra/pm.c
- arch/arm/mach-tegra/pmc.c
- arch/arm/mach-tegra/powergate.c
- arch/arm/mach-tegra/reset-handler.S
- arch/arm/mach-tegra/sleep-tegra30.S
- arch/arm/mach-tegra/tegra.c
- arch/arm/plat-samsung/include/plat/cpu.h
- drivers/clk/samsung/Makefile
- drivers/cpufreq/integrator-cpufreq.c
- drivers/cpuidle/Kconfig.arm
- drivers/cpuidle/cpuidle-calxeda.c
- drivers/dma/Kconfig
- drivers/usb/host/ohci-s3c2410.c
- include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
- include/linux/tegra-powergate.h