linux/arch/arm/mach-bcmring
Arnd Bergmann fdc24d4ba2 Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt
* 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux: (573 commits)
  ARM: vexpress: Add Device Tree for V2P-CA15 core tile (TC1 variant)
  ARM: vexpress: Add Device Tree for V2P-CA9 core tile
  ARM: vexpress: Add Device Tree for V2P-CA5s core tile
  ARM: vexpress: Motherboard RS1 memory map support
  ARM: vexpress: Add Device Tree support
  ARM: vexpress: Use FDT data in platform SMP calls
  ARM: versatile: Map local timers using Device Tree when possible
  ARM: vexpress: Get rid of MMIO_P2V

This adds full device tree boot support for the versatile express
platform, as has been awaited for a long time.

Conflicts:
	arch/arm/mach-vexpress/core.h

The definition of AMBA_DEVICE was removed in one branch, and the
definition of MMIO_P2V was removed in the other branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-02-24 12:39:18 +00:00
..
csp Fix common misspellings 2011-03-31 11:26:23 -03:00
include Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt 2012-02-24 12:39:18 +00:00
arch.c ARM: bcmring: fix build failure in mach-bcmring/arch.c 2012-02-04 11:38:20 -08:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.h
core.c ARM: amba: bcmring: use common amba device initializers 2012-01-26 19:59:29 +00:00
core.h ARM: 6912/1: bcmring: Add clkdev table in init_early 2011-05-23 18:04:54 +01:00
dma.c ARM: bcmring: remove unused DMA map code 2012-02-04 11:27:13 -08:00
dma_device.c ARM: 5647/1: bcmring: add bcmring dma.h and dma_device.c 2009-08-15 16:01:40 +01:00
irq.c Remove unneeded version.h includes from arch/arm/ 2011-09-15 14:57:06 +02:00
Kconfig bcmring: drop commented out line in Kconfig 2011-10-06 17:50:47 +02:00
Makefile ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring 2009-08-15 16:01:50 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mm.c arm: fix implicit use of page.h in several arch/arm files 2011-10-31 19:30:46 -04:00
timer.c Remove unneeded version.h includes from arch/arm/ 2011-09-15 14:57:06 +02:00