Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux...
Arnd Bergmann [Fri, 24 Feb 2012 12:39:18 +0000 (12:39 +0000)]
* '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>

1  2 
arch/arm/mach-omap2/pm24xx.c
arch/arm/mach-vexpress/core.h
arch/arm/mach-vexpress/ct-ca9x4.c
arch/arm/mach-vexpress/include/mach/ct-ca9x4.h
arch/arm/mach-vexpress/v2m.c

Simple merge
@@@ -1,2 -1,24 +1,7 @@@
- #define __MMIO_P2V(x) (((x) & 0xfffff) | (((x) & 0x0f000000) >> 4) | 0xf8000000)
- #define MMIO_P2V(x)   ((void __iomem *)__MMIO_P2V(x))
 -#define AMBA_DEVICE(name,busid,base,plat)     \
 -struct amba_device name##_device = {          \
 -      .dev            = {                     \
 -              .coherent_dma_mask = ~0UL,      \
 -              .init_name = busid,             \
 -              .platform_data = plat,          \
 -      },                                      \
 -      .res            = {                     \
 -              .start  = base,                 \
 -              .end    = base + SZ_4K - 1,     \
 -              .flags  = IORESOURCE_MEM,       \
 -      },                                      \
 -      .dma_mask       = ~0UL,                 \
 -      .irq            = IRQ_##base,           \
 -      /* .dma         = DMA_##base,*/         \
 -}
 -
+ /* 2MB large area for motherboard's peripherals static mapping */
+ #define V2M_PERIPH 0xf8000000
+ /* Tile's peripherals static mappings should start here */
+ #define V2T_PERIPH 0xf8200000
+ void vexpress_dt_smp_map_io(void);
Simple merge
Simple merge