linux/arch/arm/common, branch v3.0.43

ARM: dmabounce: fix map_single() error return value

2011-07-03T22:24:21Z

When map_single() is unable to obtain a safe buffer, we must return the dma_addr_t error value, which is ~0 rather than 0. Signed-off-by: Russell King

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable

2011-05-25T20:47:48Z

Conflicts: arch/arm/Kconfig arch/arm/mach-exynos4/mach-nuri.c

Merge branch 'devel-stable' into for-linus

2011-05-23T18:28:04Z

Conflicts: arch/arm/Kconfig arch/arm/mach-ns9xxx/include/mach/uncompress.h

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate

2011-05-23T17:05:10Z

clockevents: ARM sp804: obtain sp804 timer rate via clks

2011-05-23T17:04:53Z

This allows platforms to specify the rate of the SP804 clockevent via the clk subsystem. While ARM boards clock these at 1MHz, BCMRing also has SP804 timers but are clocked at different rates. Acked-by: Catalin Marinas Signed-off-by: Russell King

clockevents: ARM sp804: allow clockevent name to be specified

2011-05-23T17:04:53Z

This allows platforms to specify the clcokevent name upon registration. Acked-by: Catalin Marinas Signed-off-by: Russell King

clocksource: ARM sp804: obtain sp804 timer rate via clks

2011-05-23T17:04:53Z

This allows platforms to specify the rate of the SP804 clocksource via the clk subsystem. While ARM boards clock these at 1MHz, BCMRing also has SP804 timers but are clocked at different rates. Acked-by: Catalin Marinas Signed-off-by: Russell King

clocksource: ARM sp804: allow clocksource name to be specified

2011-05-23T17:04:53Z

This allows platforms to specify the clocksource name upon registration, which is necessary should they wish to register more than one sp804 clocksource. Acked-by: Catalin Marinas Signed-off-by: Russell King

clocksource: convert ARM 32-bit down counting clocksources

2011-05-23T17:04:51Z

Convert SP804, MXC, Nomadik and Orion 32-bit down-counting clocksources to generic mmio clocksource infrastructure. Acked-by: Catalin Marinas Cc: Sascha Hauer Cc: Alessandro Rubini Acked-by: Linus Walleij Cc: Lennert Buytenhek Acked-by: Nicolas Pitre Signed-off-by: Russell King

ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes

2011-05-12T07:36:53Z

Rather than each platform providing its own function to adjust the zone sizes, use the new ARM_DMA_ZONE_SIZE definition to perform this adjustment. This ensures that the actual DMA zone size and the ISA_DMA_THRESHOLD/MAX_DMA_ADDRESS definitions are consistent with each other, and moves this complexity out of the platform code. Acked-by: Nicolas Pitre Acked-by: Catalin Marinas Signed-off-by: Russell King