From: Olof Johansson Date: Tue, 11 Jun 2013 22:58:00 +0000 (-0700) Subject: Merge branch 'next/soc' into for-next X-Git-Tag: next-20130617~16^2~40 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d012e6c63adf3ae40401da4e4ee2e749b70cfca0;p=karo-tx-linux.git Merge branch 'next/soc' into for-next * next/soc: ARM: clps711x: Update defconfig ARM: clps711x: Add support for SYSCON driver ARM: clps711x: edb7211: Control LCD backlight via PWM ARM: clps711x: edb7211: Add support for I2C ARM: clps711x: Optimize interrupt handling ARM: clps711x: Add clocksource framework ARM: clps711x: Replace "arch_initcall" in common code with ".init_early" ARM: clps711x: Move specific definitions from hardware.h to boards files ARM: clps711x: p720t: Define PLD registers as GPIOs ARM: clps711x: autcpu12: Move remaining specific definitions to board file ARM: clps711x: autcpu12: Special driver for handling memory is removed ARM: clps711x: autcpu12: Add support for NOR flash ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file ARM: clps711x: Set PLL clock to zero if we work from 13 mHz source ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency ARM: clps711x: Re-add GPIO support GPIO: clps711x: Add DT support GPIO: clps711x: Rewrite driver for using generic GPIO code Signed-off-by: Olof Johansson --- d012e6c63adf3ae40401da4e4ee2e749b70cfca0 diff --cc arch/arm/arm-soc-for-next-contents.txt index ad8aa5038e33,000000000000..47944b00545d mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,93 -1,0 +1,113 @@@ +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 + +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 + +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 + +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 + +next/drivers + ux500/dma40 + git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc + +next/mailbox: + mailbox/subsystem + git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox + +