From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 21 Mar 2012 14:27:34 +0000 (+0000)
Subject: Merge branch 'tegra/cleanups' into next/timer
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2cbe23e3a432e3d09a849adb197c8fcc09e7391d;p=~shefty%2Frdma-dev.git

Merge branch 'tegra/cleanups' into next/timer

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

The tegra Makefile was changed in four different branches
in the same line. This merge should reduce the amount
of churn.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

2cbe23e3a432e3d09a849adb197c8fcc09e7391d
diff --cc arch/arm/mach-tegra/Makefile
index f7d044369ed,829066fdc2a..bcbb4e8d553
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -13,7 -13,8 +13,7 @@@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= teg
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= pinmux-tegra20-tables.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= pinmux-tegra30-tables.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= board-dt-tegra30.o
- obj-$(CONFIG_SMP)                       += platsmp.o headsmp.o
+ obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o
 -obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o
  obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
  obj-$(CONFIG_TEGRA_SYSTEM_DMA)		+= dma.o
  obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
diff --cc arch/arm/mach-vexpress/core.h
index 3508f6ef78e,9f0f2827c71..33c5a825aba
--- a/arch/arm/mach-vexpress/core.h
+++ b/arch/arm/mach-vexpress/core.h
@@@ -1,22 -1,2 +1,5 @@@
- #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,*/		\
- }
- 
 -#define __MMIO_P2V(x)	(((x) & 0xfffff) | (((x) & 0x0f000000) >> 4) | 0xf8000000)
 -#define MMIO_P2V(x)	((void __iomem *)__MMIO_P2V(x))
 +/* 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