Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Linux Kernel / Linux Kernel - Linus Torvalds [linux-foundation.org] - 6 September 2013 15:30 EDT

b4b50fd Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

.../devicetree/bindings/arm/omap/omap.txt | 3 +
.../devicetree/bindings/arm/vexpress-scc.txt | 33 +
Documentation/devicetree/bindings/bus/imx-weim.txt | 17 +-
.../devicetree/bindings/bus/mvebu-mbus.txt | 276 +++
.../devicetree/bindings/clock/imx5-clock.txt | 1 +
.../devicetree/bindings/clock/imx6q-clock.txt | 6 +
.../devicetree/bindings/pci/mvebu-pci.txt | 145 +-
.../bindings/pci/nvidia,tegra20-pcie.txt | 163 ++
.../devicetree/bindings/watchdog/sun4i-wdt.txt | 13 -
.../devicetree/bindings/watchdog/sunxi-wdt.txt | 14 +
MAINTAINERS | 7 +
arch/arm/Kconfig | 3 +-
arch/arm/boot/dts/Makefile | 6 +
arch/arm/boot/dts/armada-370-db.dts | 5 +-
arch/arm/boot/dts/armada-370-mirabox.dts | 37 +-
arch/arm/boot/dts/armada-370-netgear-rn102.dts | 179 ++
arch/arm/boot/dts/armada-370-rd.dts | 37 +-
arch/arm/boot/dts/armada-370-xp.dtsi | 113 +-
arch/arm/boot/dts/armada-370.dtsi | 123 +-
arch/arm/boot/dts/armada-xp-axpwifiap.dts | 164 ++
arch/arm/boot/dts/armada-xp-db.dts | 131 +-
arch/arm/boot/dts/armada-xp-gp.dts | 107 +-
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 228 ++-
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 269 +--
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 417 ++--
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 88 +-
arch/arm/boot/dts/armada-xp.dtsi | 11 +-
arch/arm/boot/dts/da850-evm.dts | 11 +
arch/arm/boot/dts/da850.dtsi | 46 +-
arch/arm/boot/dts/imx25.dtsi | 35 +-
arch/arm/boot/dts/imx27-apf27dev.dts | 5 +
arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 93 +
arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts | 44 +
arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 13 +
arch/arm/boot/dts/imx27-phytec-phycore-som.dts | 125 +-
arch/arm/boot/dts/imx27.dtsi | 120 +-
arch/arm/boot/dts/imx31.dtsi | 17 +
arch/arm/boot/dts/imx51-apf51.dts | 4 -
arch/arm/boot/dts/imx51-babbage.dts | 5 +
arch/arm/boot/dts/imx51.dtsi | 632 +++---
arch/arm/boot/dts/imx53-qsb.dts | 18 +-
arch/arm/boot/dts/imx53.dtsi | 56 +-
arch/arm/boot/dts/imx6dl-pinfunc.h | 2138 ++++++++++----------
arch/arm/boot/dts/imx6dl-sabreauto.dts | 22 -
arch/arm/boot/dts/imx6dl-sabresd.dts | 19 -
arch/arm/boot/dts/imx6dl-wandboard.dts | 24 +-
arch/arm/boot/dts/imx6dl.dtsi | 254 +--
arch/arm/boot/dts/imx6q-arm2.dts | 14 +-
arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 112 +-
arch/arm/boot/dts/imx6q-pinfunc.h | 2050 +++++++++----------
arch/arm/boot/dts/imx6q-sabreauto.dts | 22 +-
arch/arm/boot/dts/imx6q-sabrelite.dts | 22 +-
arch/arm/boot/dts/imx6q-sabresd.dts | 19 +-
arch/arm/boot/dts/imx6q-wandboard.dts | 26 +
arch/arm/boot/dts/imx6q.dtsi | 393 +---
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 22 +
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 92 +-
arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 137 ++
arch/arm/boot/dts/imx6qdl.dtsi | 770 ++++++-
arch/arm/boot/dts/imx6sl.dtsi | 35 +-
arch/arm/boot/dts/kirkwood-6281.dtsi | 66 +-
arch/arm/boot/dts/kirkwood-6282.dtsi | 102 +-
arch/arm/boot/dts/kirkwood-cloudbox.dts | 4 +-
arch/arm/boot/dts/kirkwood-db-88f6281.dts | 7 +-
arch/arm/boot/dts/kirkwood-db-88f6282.dts | 7 +-
arch/arm/boot/dts/kirkwood-db.dtsi | 10 +-
arch/arm/boot/dts/kirkwood-dns320.dts | 2 +-
arch/arm/boot/dts/kirkwood-dns325.dts | 2 +-
arch/arm/boot/dts/kirkwood-dnskw.dtsi | 4 +-
arch/arm/boot/dts/kirkwood-dockstar.dts | 4 +-
arch/arm/boot/dts/kirkwood-dreamplug.dts | 4 +-
arch/arm/boot/dts/kirkwood-goflexnet.dts | 4 +-
.../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 4 +-
arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 +-
arch/arm/boot/dts/kirkwood-iconnect.dts | 23 +-
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 4 +-
arch/arm/boot/dts/kirkwood-is2.dts | 2 +-
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 4 +-
arch/arm/boot/dts/kirkwood-lschlv2.dts | 2 +-
arch/arm/boot/dts/kirkwood-lsxhl.dts | 2 +-
arch/arm/boot/dts/kirkwood-lsxl.dtsi | 4 +-
arch/arm/boot/dts/kirkwood-mplcec4.dts | 23 +-
.../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 43 +-
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 4 +-
arch/arm/boot/dts/kirkwood-ns2.dts | 2 +-
arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +-
arch/arm/boot/dts/kirkwood-ns2max.dts | 2 +-
arch/arm/boot/dts/kirkwood-ns2mini.dts | 2 +-
arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 107 +
arch/arm/boot/dts/kirkwood-nsa310.dts | 111 +-
arch/arm/boot/dts/kirkwood-nsa310a.dts | 165 ++
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 4 +-
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 4 +-
arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 2 +-
arch/arm/boot/dts/kirkwood-sheevaplug.dts | 2 +-
arch/arm/boot/dts/kirkwood-topkick.dts | 4 +-
arch/arm/boot/dts/kirkwood-ts219-6281.dts | 6 +-
arch/arm/boot/dts/kirkwood-ts219-6282.dts | 25 +-
arch/arm/boot/dts/kirkwood-ts219.dtsi | 17 +-
arch/arm/boot/dts/kirkwood.dtsi | 17 +-
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 6 +
arch/arm/boot/dts/vf610-twr.dts | 7 +
arch/arm/configs/imx_v4_v5_defconfig | 19 +-
arch/arm/configs/imx_v6_v7_defconfig | 51 +-
arch/arm/configs/mxs_defconfig | 19 +-
arch/arm/configs/omap2plus_defconfig | 1 +
arch/arm/include/asm/mach/pci.h | 4 +
arch/arm/kernel/bios32.c | 16 +
arch/arm/mach-at91/board-dt-sama5.c | 17 +-
arch/arm/mach-davinci/board-da830-evm.c | 6 +-
arch/arm/mach-davinci/board-da850-evm.c | 6 +-
arch/arm/mach-davinci/board-dm355-evm.c | 6 +-
arch/arm/mach-davinci/board-dm355-leopard.c | 6 +-
arch/arm/mach-davinci/board-dm365-evm.c | 6 +-
arch/arm/mach-davinci/board-dm644x-evm.c | 6 +-
arch/arm/mach-davinci/board-dm646x-evm.c | 6 +-
arch/arm/mach-davinci/board-mityomapl138.c | 6 +-
arch/arm/mach-davinci/board-neuros-osd2.c | 6 +-
arch/arm/mach-davinci/board-omapl138-hawk.c | 6 +-
arch/arm/mach-davinci/board-sffsdr.c | 6 +-
arch/arm/mach-davinci/da830.c | 8 +-
arch/arm/mach-davinci/da850.c | 8 +-
arch/arm/mach-davinci/da8xx-dt.c | 14 +-
arch/arm/mach-davinci/davinci.h | 5 +
arch/arm/mach-davinci/devices-da8xx.c | 59 +-
arch/arm/mach-davinci/devices-tnetv107x.c | 39 +-
arch/arm/mach-davinci/dm355.c | 51 +-
arch/arm/mach-davinci/dm365.c | 40 +-
arch/arm/mach-davinci/dm644x.c | 54 +-
arch/arm/mach-davinci/dm646x.c | 54 +-
arch/arm/mach-davinci/include/mach/common.h | 1 -
arch/arm/mach-davinci/include/mach/da8xx.h | 2 +-
arch/arm/mach-davinci/include/mach/serial.h | 10 +-
arch/arm/mach-davinci/include/mach/tnetv107x.h | 3 +-
arch/arm/mach-davinci/serial.c | 54 +-
arch/arm/mach-davinci/tnetv107x.c | 8 +-
arch/arm/mach-dove/common.c | 68 +-
arch/arm/mach-imx/Kconfig | 3 +-
arch/arm/mach-imx/Makefile | 3 +-
arch/arm/mach-imx/anatop.c | 4 +-
arch/arm/mach-imx/clk-fixup-div.c | 129 ++
arch/arm/mach-imx/clk-fixup-mux.c | 107 +
arch/arm/mach-imx/clk-imx51-imx53.c | 3 +-
arch/arm/mach-imx/clk-imx6q.c | 57 +-
arch/arm/mach-imx/clk-imx6sl.c | 20 +-
arch/arm/mach-imx/clk-pllv3.c | 15 +-
arch/arm/mach-imx/clk.c | 26 +
arch/arm/mach-imx/clk.h | 10 +
arch/arm/mach-imx/common.h | 13 +-
arch/arm/mach-imx/mach-imx6q.c | 171 +-
arch/arm/mach-imx/mach-imx6sl.c | 3 +-
arch/arm/mach-imx/mm-imx5.c | 4 +-
arch/arm/mach-imx/pm-imx5.c | 7 +-
arch/arm/mach-imx/system.c | 33 +
arch/arm/mach-kirkwood/board-dt.c | 1 +
arch/arm/mach-kirkwood/common.c | 26 +-
arch/arm/mach-kirkwood/pcie.c | 40 +-
arch/arm/mach-mv78xx0/pcie.c | 23 +-
arch/arm/mach-mvebu/armada-370-xp.c | 34 +-
arch/arm/mach-mvebu/platsmp.c | 25 +-
arch/arm/mach-mxs/mach-mxs.c | 62 +-
arch/arm/mach-mxs/pm.c | 1 +
arch/arm/mach-omap1/include/mach/soc.h | 1 +
arch/arm/mach-omap2/Kconfig | 12 +-
arch/arm/mach-omap2/Makefile | 6 +
arch/arm/mach-omap2/board-generic.c | 18 +
arch/arm/mach-omap2/common.h | 1 +
arch/arm/mach-omap2/id.c | 4 +-
arch/arm/mach-omap2/io.c | 20 +-
arch/arm/mach-omap2/omap54xx.h | 4 +
arch/arm/mach-omap2/omap_hwmod.c | 2 +-
arch/arm/mach-omap2/soc.h | 17 +
arch/arm/mach-omap2/timer.c | 3 +-
arch/arm/mach-orion5x/common.c | 36 +-
arch/arm/mach-orion5x/common.h | 17 +
arch/arm/mach-orion5x/d2net-setup.c | 6 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 24 +-
arch/arm/mach-orion5x/dns323-setup.c | 6 +-
arch/arm/mach-orion5x/edmini_v2-setup.c | 6 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 12 +-
arch/arm/mach-orion5x/ls-chl-setup.c | 6 +-
arch/arm/mach-orion5x/ls_hgl-setup.c | 6 +-
arch/arm/mach-orion5x/lsmini-setup.c | 6 +-
arch/arm/mach-orion5x/mss2-setup.c | 6 +-
arch/arm/mach-orion5x/mv2120-setup.c | 6 +-
arch/arm/mach-orion5x/net2big-setup.c | 6 +-
arch/arm/mach-orion5x/pci.c | 9 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 6 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 6 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 13 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 6 +-
arch/arm/mach-orion5x/ts209-setup.c | 6 +-
arch/arm/mach-orion5x/ts409-setup.c | 6 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 6 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 6 +-
arch/arm/mach-prima2/pm.c | 21 +-
arch/arm/mach-shmobile/Kconfig | 4 +-
arch/arm/mach-shmobile/board-ape6evm.c | 1 +
arch/arm/mach-shmobile/board-lager.c | 1 +
arch/arm/mach-shmobile/clock-emev2.c | 18 -
arch/arm/mach-shmobile/clock-r8a73a4.c | 199 +-
arch/arm/mach-shmobile/clock-r8a7740.c | 1 +
arch/arm/mach-shmobile/clock-r8a7790.c | 27 +-
arch/arm/mach-shmobile/include/mach/emev2.h | 1 -
arch/arm/mach-shmobile/include/mach/r8a73a4.h | 1 +
arch/arm/mach-shmobile/include/mach/r8a7740.h | 2 +
arch/arm/mach-shmobile/include/mach/r8a7790.h | 4 +
arch/arm/mach-shmobile/setup-r8a73a4.c | 30 +
arch/arm/mach-shmobile/setup-r8a7740.c | 10 +
arch/arm/mach-shmobile/setup-r8a7790.c | 106 +-
arch/arm/mach-shmobile/smp-emev2.c | 11 +-
arch/arm/mach-sunxi/Kconfig | 2 +
arch/arm/mach-sunxi/Makefile.boot | 1 -
arch/arm/mach-sunxi/sunxi.c | 45 +-
arch/arm/mach-tegra/Kconfig | 28 +-
arch/arm/mach-tegra/Makefile | 6 +-
arch/arm/mach-tegra/board-harmony-pcie.c | 89 -
arch/arm/mach-tegra/board.h | 8 -
arch/arm/mach-tegra/common.h | 1 -
arch/arm/mach-tegra/cpuidle-tegra114.c | 51 +-
arch/arm/mach-tegra/cpuidle-tegra20.c | 12 +
arch/arm/mach-tegra/cpuidle.c | 10 +
arch/arm/mach-tegra/cpuidle.h | 1 +
arch/arm/mach-tegra/flowctrl.c | 2 +
arch/arm/mach-tegra/flowctrl.h | 9 +
arch/arm/mach-tegra/headsmp.S | 3 +-
arch/arm/mach-tegra/hotplug.c | 13 +-
arch/arm/mach-tegra/iomap.h | 11 +-
arch/arm/mach-tegra/irq.c | 40 +
arch/arm/mach-tegra/pcie.c | 886 --------
arch/arm/mach-tegra/platsmp.c | 1 -
arch/arm/mach-tegra/pm-tegra20.c | 34 +
arch/arm/mach-tegra/pm-tegra30.c | 34 +
arch/arm/mach-tegra/pm.c | 148 +-
arch/arm/mach-tegra/pm.h | 12 +
arch/arm/mach-tegra/pmc.c | 53 +-
arch/arm/mach-tegra/pmc.h | 3 +
arch/arm/mach-tegra/reset-handler.S | 21 +-
arch/arm/mach-tegra/reset.c | 2 +
arch/arm/mach-tegra/reset.h | 4 +
arch/arm/mach-tegra/sleep-tegra20.S | 297 +++
arch/arm/mach-tegra/sleep-tegra30.S | 616 +++++-
arch/arm/mach-tegra/sleep.S | 37 +-
arch/arm/mach-tegra/sleep.h | 14 +-
arch/arm/mach-tegra/tegra.c | 24 -
arch/arm/mach-ux500/board-mop500.c | 5 +-
arch/arm/mach-ux500/cpu-db8500.c | 2 +-
arch/arm/mach-ux500/cpu.c | 8 +
arch/arm/mach-ux500/devices-db8500.c | 1 +
arch/arm/mach-ux500/headsmp.S | 2 -
arch/arm/mach-ux500/setup.h | 3 +
arch/arm/mach-vexpress/Kconfig | 8 +
arch/arm/mach-vexpress/Makefile | 1 +
arch/arm/mach-vexpress/dcscb.c | 66 +-
arch/arm/mach-vexpress/spc.c | 180 ++
arch/arm/mach-vexpress/spc.h | 24 +
arch/arm/mach-vexpress/tc2_pm.c | 352 ++++
arch/arm/plat-omap/Kconfig | 2 +-
arch/ia64/Kconfig | 1 -
arch/mips/Kconfig | 2 -
arch/mips/include/asm/pci.h | 5 -
arch/powerpc/Kconfig | 1 -
arch/powerpc/include/asm/pci.h | 5 -
arch/s390/Kconfig | 1 -
arch/s390/include/asm/pci.h | 4 -
arch/sparc/Kconfig | 1 -
arch/tile/Kconfig | 1 -
arch/x86/Kconfig | 1 -
arch/x86/include/asm/pci.h | 30 -
arch/x86/kernel/x86_init.c | 24 +
drivers/bus/Kconfig | 3 +-
drivers/bus/imx-weim.c | 129 +-
drivers/bus/mvebu-mbus.c | 441 ++--
drivers/clk/tegra/clk-tegra114.c | 38 +
drivers/memory/mvebu-devbus.c | 72 +-
drivers/of/of_pci.c | 45 +
drivers/pci/Kconfig | 4 -
drivers/pci/host/Kconfig | 4 +
drivers/pci/host/Makefile | 1 +
drivers/pci/host/pci-mvebu.c | 115 +-
drivers/pci/host/pci-tegra.c | 1691 ++++++++++++++++
drivers/pci/msi.c | 85 +-
drivers/pci/probe.c | 1 +
include/linux/mbus.h | 16 +-
include/linux/micrel_phy.h | 6 +
include/linux/msi.h | 21 +-
include/linux/of_pci.h | 12 +
include/linux/pci.h | 1 +
include/linux/tegra-cpuidle.h | 25 +
289 files changed, 12557 insertions(+), 6435 deletions(-)

Upstream: git.kernel.org


  • Share