From: Olof Johansson Date: Fri, 14 Jun 2013 21:33:57 +0000 (-0700) Subject: Merge branch 'next/soc' into for-next X-Git-Tag: next-20130617~16^2~27 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4da76587a3352aa3452afbd89e56f3db5c7cfcf4;p=karo-tx-linux.git Merge branch 'next/soc' into for-next * next/soc: (29 commits) ARM: OMAP2+: AM43x: SRAM base and size ARM: OMAP2+: AM43x: GP or HS ? ARM: OMAP2+: AM43x: early init ARM: OMAP2+: AM43x: static mapping ARM: OMAP2+: AM437x: SoC revision detection ARM: OMAP2+: AM43x: soc_is support ARM: OMAP2+: AM43x: kbuild ARM: OMAP2+: AM43x: Kconfig ARM: OMAP2+: separate out OMAP4 restart ARM: OMAP5: Remove unused include for ocp2scp ARM: AM33XX: clk: Add clock node for EHRPWM TBCLK ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies ARM: OMAP2+: AM33xx: Add missing reset status info to GFX hwmod ARM: OMAP5: Enable build and frameowrk initialisations ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data ARM: OMAP5: hwmod data: Create initial OMAP5 SOC hwmod data ARM: OMAP5: powerdomain data: Add OMAP54XX data and update the header ARM: OMAP5: clockdomain data: Add OMAP54XX data and update the header ARM: OMAP5: SCRM: Add OMAP54XX header file. ARM: OMAP5: PRCM: Add OMAP54XX local MPU PRCM registers ... Signed-off-by: Olof Johansson --- 4da76587a3352aa3452afbd89e56f3db5c7cfcf4 diff --cc arch/arm/arm-soc-for-next-contents.txt index 5a659336ca5d,000000000000..099b4a83e001 mode 100644,000000..100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@@ -1,134 -1,0 +1,140 @@@ +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 + + +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 + +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 + +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 + +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 + +next/mailbox: + mailbox/subsystem + git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox + + diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_data.c index 3c7675a6a8f4,1e2a6fb835c2..28bbd56346a9 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c @@@ -249,9 -329,14 +249,9 @@@ static struct omap_hwmod_class am33xx_g }; static struct omap_hwmod_rst_info am33xx_gfx_resets[] = { - { .name = "gfx", .rst_shift = 0 }, + { .name = "gfx", .rst_shift = 0, .st_shift = 0}, }; -static struct omap_hwmod_irq_info am33xx_gfx_irqs[] = { - { .name = "gfxint", .irq = 37 + OMAP_INTC_START, }, - { .irq = -1 }, -}; - static struct omap_hwmod am33xx_gfx_hwmod = { .name = "gfx", .class = &am33xx_gfx_hwmod_class,