From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 22:11:46 +0000 (+0100)
Subject: Merge branch 'depends/rmk/memory_h' into next/fixes
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5725aeae5ff2e39f3815bbef788ee326c9afea2c;p=deliverable%2Flinux.git

Merge branch 'depends/rmk/memory_h' into next/fixes

Fix up all conflicts between the memory.h cleanup and bug fixes.

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

5725aeae5ff2e39f3815bbef788ee326c9afea2c
diff --cc arch/arm/Kconfig
index cbb18264cdce,b7f7510658d6..2d95b5b5cf49
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -377,6 -390,7 +390,7 @@@ config ARCH_EP93X
  	select ARCH_REQUIRE_GPIOLIB
  	select ARCH_HAS_HOLES_MEMORYMODEL
  	select ARCH_USES_GETTIMEOFFSET
 -	select NEED_MEMORY_H
++	select NEED_MACH_MEMORY_H
  	help
  	  This enables support for the Cirrus EP93xx series of CPUs.
  
@@@ -835,7 -860,7 +860,8 @@@ config ARCH_U30
  	select CLKDEV_LOOKUP
  	select HAVE_MACH_CLKDEV
  	select GENERIC_GPIO
 +	select ARCH_REQUIRE_GPIOLIB
+ 	select NEED_MACH_MEMORY_H
  	help
  	  Support for ST-Ericsson U300 series mobile platforms.
  
diff --cc arch/arm/mach-imx/mach-cpuimx27.c
index f851fe903687,881add0fbe5b..b1ec2cf53bb0
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@@ -310,8 -310,8 +310,8 @@@ static struct sys_timer eukrea_cpuimx27
  	.init = eukrea_cpuimx27_timer_init,
  };
  
 -MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")
 +MACHINE_START(EUKREA_CPUIMX27, "EUKREA CPUIMX27")
- 	.boot_params = MX27_PHYS_OFFSET + 0x100,
+ 	.atag_offset = 0x100,
  	.map_io = mx27_map_io,
  	.init_early = imx27_init_early,
  	.init_irq = mx27_init_irq,
diff --cc arch/arm/mach-imx/mach-cpuimx35.c
index 4bd083ba9af2,10b89139da48..470b654b0e6e
--- a/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@@ -192,9 -192,9 +192,9 @@@ struct sys_timer eukrea_cpuimx35_timer 
  	.init	= eukrea_cpuimx35_timer_init,
  };
  
 -MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
 +MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35")
  	/* Maintainer: Eukrea Electromatique */
- 	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+ 	.atag_offset = 0x100,
  	.map_io = mx35_map_io,
  	.init_early = imx35_init_early,
  	.init_irq = mx35_init_irq,
diff --cc arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index 2442d5da883d,d8699b54268d..9163318e95a2
--- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@@ -161,9 -161,9 +161,9 @@@ static struct sys_timer eukrea_cpuimx25
  	.init   = eukrea_cpuimx25_timer_init,
  };
  
 -MACHINE_START(EUKREA_CPUIMX25, "Eukrea CPUIMX25")
 +MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25")
  	/* Maintainer: Eukrea Electromatique */
- 	.boot_params = MX25_PHYS_OFFSET + 0x100,
+ 	.atag_offset = 0x100,
  	.map_io = mx25_map_io,
  	.init_early = imx25_init_early,
  	.init_irq = mx25_init_irq,
diff --cc arch/arm/mach-pxa/palmtreo.c
index 30364b0af908,7346fbfa8101..94e9708b349d
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@@ -441,11 -438,9 +441,11 @@@ static void __init centro_init(void
  	palm27x_mmc_init(GPIO_NR_TREO_SD_DETECT_N, -1,
  			GPIO_NR_CENTRO_SD_POWER, 1);
  }
 +#endif
  
 +#ifdef CONFIG_MACH_TREO680
  MACHINE_START(TREO680, "Palm Treo 680")
- 	.boot_params    = 0xa0000100,
+ 	.atag_offset    = 0x100,
  	.map_io         = pxa27x_map_io,
  	.reserve	= treo_reserve,
  	.init_irq       = pxa27x_init_irq,
@@@ -453,11 -448,9 +453,11 @@@
  	.timer          = &pxa_timer,
  	.init_machine   = treo680_init,
  MACHINE_END
 +#endif
  
 +#ifdef CONFIG_MACH_CENTRO
  MACHINE_START(CENTRO, "Palm Centro 685")
- 	.boot_params    = 0xa0000100,
+ 	.atag_offset    = 0x100,
  	.map_io         = pxa27x_map_io,
  	.reserve	= treo_reserve,
  	.init_irq       = pxa27x_init_irq,