[ARM] 5342/1: ep93xx: platform init cleanup

Use EP93XX_*_PHYS_BASE and SZ_* defines in ep93xx platform inits.

The following patch changes the flash memory hard-coded resource
addresses and MACHINE_START boot_params to EP93XX_*_PHYS_BASE and
SZ_* defines to improve readability. Also some minor whitespace
cleanup resulting from previous patches.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c
index 561db73..aa72787 100644 (file)
--- a/arch/arm/mach-ep93xx/adssphere.c
+++ b/arch/arm/mach-ep93xx/adssphere.c
@@ -28,8 +28,8 @@ static struct physmap_flash_data adssphere_flash_data = {
 };
 
 static struct resource adssphere_flash_resource = {
-       .start          = 0x60000000,
-       .end            = 0x61ffffff,
+       .start          = EP93XX_CS6_PHYS_BASE,
+       .end            = EP93XX_CS6_PHYS_BASE + SZ_32M - 1,
        .flags          = IORESOURCE_MEM,
 };
 
@@ -59,7 +59,7 @@ MACHINE_START(ADSSPHERE, "ADS Sphere board")
        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
        .phys_io        = EP93XX_APB_PHYS_BASE,
        .io_pg_offst    = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
-       .boot_params    = 0x00000100,
+       .boot_params    = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
        .map_io         = ep93xx_map_io,
        .init_irq       = ep93xx_init_irq,
        .timer          = &ep93xx_timer,

diff --cc arch/arm/mach-ep93xx/edb9302.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9302a.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9307.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9312.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9315.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb9315a.c
Simple merge

diff --cc arch/arm/mach-ep93xx/gesbc9312.c
Simple merge

diff --cc arch/arm/mach-ep93xx/micro9.c
Simple merge

diff --cc arch/arm/mach-ep93xx/ts72xx.c
Simple merge