From: Olof Johansson Date: Fri, 14 Jun 2013 23:07:34 +0000 (-0700) Subject: Merge branch 'next/soc' into for-next X-Git-Tag: next-20130617~16^2~21 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5be9439ff2d0461252b91cc3cc9c04406125448d;p=karo-tx-linux.git Merge branch 'next/soc' into for-next * next/soc: ARM: integrator: get PCI device IRQs from device tree ARM: integrator: basic PCIv3 device tree support ARM: integrator: move static ioremapping into PCIv3 driver ARM: integrator: move VGA base assignment ARM: integrator: remap PCIv3 base dynamically ARM: integrator: move V3 register definitions into driver ARM: integrator: move PCI base address grab to probe ARM: integrator: grab PCI error IRQ in probe() ARM: integrator: convert PCIv3 bridge to platform device ARM: integrator: merge PCIv3 driver into one file ARM: pci: create pci_common_init_dev() Documentation/devicetree: add a small note on PCI Signed-off-by: Olof Johansson --- 5be9439ff2d0461252b91cc3cc9c04406125448d diff --cc arch/arm/arm-soc-for-next-contents.txt index 60a7cf7ee082,000000000000..c807bbb92286 mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,199 -1,0 +1,152 @@@ +for-next contents for 3.11: +Format is a little different from before in an attempt to make it easier to read: + + + + + <...> + <...> + +depends/rmk-devel-stable + http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable + +next/fixes-non-critical + mvebu/fixes-non-critical + git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1 + sirf/fixes-non-critical + git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git tags/sirf-arm-soc-v3.10-fixes + omap/fixes-non-critical + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-non-critical-signed + davinci/board + git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.11/board + +next/cleanup + at91/cleanup + git://github.com/at91linux/linux-at91.git tags/at91-cleanup + machdesc/cleanup + git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11 + mvebu/cleanup + git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3 + dt/pci-helpers + git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11 + omap/cleanup + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed + mvebu/cleanup4 + git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-4 + +next/soc + mvebu/soc + git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2 + mvebu/defconfig + git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3 + mvebu/pcie + git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2 + mvebu/pcie-kirkwood + git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11 + mvebu/pcie2 + git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11 + mvebu/clk-cleanup + git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11 + vexpress/dual-cluster + git://git.linaro.org/people/nico/linux VExpress_DCSCB + depends on depends/rmk-devel-stable + +patch "drivers/bus: arm-cci: fix combined ARMv6+v7 build" + zynq/clk + git://git.xilinx.com/linux-xlnx tags/zynq-clk-for-3.11 + mvebu/pcie-kirkwood2 + git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11-2 + renesas/pinmux-gpio + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.11 + renesas/soc + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11 + clps711x/soc + patches + GPIO: clps711x: Rewrite driver for using generic GPIO cod + GPIO: clps711x: Add DT support + ARM: clps711x: Re-add GPIO support + ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency + ARM: clps711x: Set PLL clock to zero if we work from 13 mHz sourc + ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file + ARM: clps711x: autcpu12: Add support for NOR flash + ARM: clps711x: autcpu12: Special driver for handling memory is re + ARM: clps711x: autcpu12: Move remaining specific definitions to b + ARM: clps711x: p720t: Define PLD registers as GPIOs + ARM: clps711x: Move specific definitions from hardware.h to board + ARM: clps711x: Replace "arch_initcall" in common code with ".init + ARM: clps711x: Add clocksource framework + ARM: clps711x: Optimize interrupt handling + ARM: clps711x: edb7211: Add support for I2C + ARM: clps711x: edb7211: Control LCD backlight via PWM + ARM: clps711x: Add support for SYSCON driver + ARM: clps711x: Update defconfig + patches + ARM: socfpga: Add support to gate peripheral clocks + ARM: socfpga: Add syscon to be part of socfpga + samsung/s3c24xx-arch + git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-arch-1 + omap/pm + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-signed + omap/soc + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed + omap/omap5 + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-signed + mvebu/regmap + git://git.infradead.org/users/jcooper/linux.git tags/regmap-3.11 + depends on cleanup and fixes-non-critical branches - > - > thx, - > - > Jason. - > - > - > The following changes since commit fdc0b43fbb0e0958f13d3453dfb9df707c0af904: - > - > Merge tag 'tags/cleanup-3.11-3' into mvebu/regmap (2013-06-13 17:47:57 +0000) - > - > are available in the git repository at: - > - > - > git://git.infradead.org/users/jcooper/linux.git tags/regmap-3.11 - > - > for you to fetch changes up to 5fb2038d61ce94e7c9224db2aaff5633ca224953: - > - > arm: mvebu: disable DEBUG_LL/EARLY_PRINTK in defconfig (2013-06-13 17:48:59 +0000) - > - > ---------------------------------------------------------------- - > mvebu register map changes for v3.11 - > - > This series removes the hardcoded register base address for mvebu. - > - > Depends: - > - mvebu/fixes-non-critical (up to tags/fixes-non-3.11-1) - > - mvebu/cleanup (up to tags/cleanup-3.11-3) - > - > ---------------------------------------------------------------- - > Thomas Petazzoni (8): - > arm: mvebu: remove dependency of SMP init on static I/O mapping - > arm: mvebu: avoid hardcoded virtual address in coherency code - > arm: mvebu: move cache and mvebu-mbus initialization later - > arm: mvebu: remove hardcoded static I/O mapping - > arm: mvebu: don't hardcode a physical address in headsmp.S - > arm: mvebu: don't hardcode the physical address for mvebu-mbus - > arm: mvebu: add another earlyprintk Kconfig option - > arm: mvebu: disable DEBUG_LL/EARLY_PRINTK in defconfig - > - > arch/arm/Kconfig.debug | 30 ++++++++++++++++++++-- - > arch/arm/configs/mvebu_defconfig | 2 -- - > arch/arm/include/debug/mvebu.S | 5 ++++ - > arch/arm/mach-mvebu/armada-370-xp.c | 51 ++++++++++++++++++++----------------- - > arch/arm/mach-mvebu/armada-370-xp.h | 10 -------- - > arch/arm/mach-mvebu/coherency.c | 44 ++++++++++++++++---------------- - > arch/arm/mach-mvebu/coherency.h | 4 --- - > arch/arm/mach-mvebu/common.h | 2 ++ - > arch/arm/mach-mvebu/headsmp.S | 16 ++++++------ - > arch/arm/mach-mvebu/platsmp.c | 10 +++++++- ++ integrator/pci ++ git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-pci-for-arm-soc + +next/boards + mvebu/boards + git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2 + renesas/defconfig + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.11 + renesas/boards + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.11 + depends on renesas/pinmux-gpio + depends on renesas/soc + +next/dt + nomadik/dt + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc + mvebu/dt + git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3 + patch + "ARM: nomadik: fix clocksource warning" + at91/dt + git://github.com/at91linux/linux-at91.git tags/at91-dt + vt8500/dt + git://github.com/linux-wmt/linux-vtwm vt8500/dts-3.11 + cleanup/dts-cpus + git://linux-arm.org/linux-2.6-lp dts-cpus-updates + patch + "ARM: dts: add missing cpu #address-cell values" + mvebu/dt4 + git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-4 + renesas/dt + git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.11 + patches + ARM: socfpga: dts: Add ethernet bindings for SOCFPGA + ARM: socfpga: dts: Add gate-clock bindings + samsung/s3c24xx-dt + git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-dt-1 + samsung/exynos-dt + git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-dt-1 + mvebu/dt5 + git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-5 + +next/drivers + ux500/dma40 + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc + timer/dw_apb_timer_of + git://github.com/mmind/linux-rockchip.git tags/dw_apb_timer_of + samsung/s3c24xx-drivers + git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-driver-1 + omap/gpmc + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed + +next/mailbox: + mailbox/subsystem + git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox + +