Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e48f3fa3 authored by Hartley Sweeten's avatar Hartley Sweeten Committed by Russell King
Browse files

[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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 854feaed

arch/arm/mach-ep93xx/adssphere.c

+3 −3
Original line number Diff line number Diff line
@@ -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,

arch/arm/mach-ep93xx/edb9302.c

+3 −3
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ static struct physmap_flash_data edb9302_flash_data = { 
};



static struct resource edb9302_flash_resource = {

	.start		= 0x60000000,

	.end		= 0x60ffffff,

	.start		= EP93XX_CS6_PHYS_BASE,

	.end		= EP93XX_CS6_PHYS_BASE + SZ_16M - 1,

	.flags		= IORESOURCE_MEM,

};
@@ -59,7 +59,7 @@ MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board") 
	/* Maintainer: George Kashperko <george@chas.com.ua> */

	.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,

arch/arm/mach-ep93xx/edb9302a.c

+4 −4
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ static struct physmap_flash_data edb9302a_flash_data = { 
};



static struct resource edb9302a_flash_resource = {

	.start		= 0x60000000,

	.end		= 0x60ffffff,

	.start		= EP93XX_CS6_PHYS_BASE,

	.end		= EP93XX_CS6_PHYS_BASE + SZ_16M - 1,

	.flags		= IORESOURCE_MEM,

};
@@ -59,7 +59,7 @@ MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board") 
	/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */

	.phys_io	= EP93XX_APB_PHYS_BASE,

	.io_pg_offst	= ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,

	.boot_params	= 0xc0000100,

	.boot_params	= EP93XX_SDCE0_PHYS_BASE + 0x100,

	.map_io		= ep93xx_map_io,

	.init_irq	= ep93xx_init_irq,

	.timer		= &ep93xx_timer,

arch/arm/mach-ep93xx/edb9307.c

+4 −4
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ static struct physmap_flash_data edb9307_flash_data = { 
};



static struct resource edb9307_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(EDB9307, "Cirrus Logic EDB9307 Evaluation Board") 
	/* Maintainer: Herbert Valerio Riedel <hvr@gnu.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,

arch/arm/mach-ep93xx/edb9312.c

+4 −4
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ static struct physmap_flash_data edb9312_flash_data = { 
};



static struct resource edb9312_flash_resource = {

	.start		= 0x60000000,

	.end		= 0x61ffffff,

	.start		= EP93XX_CS6_PHYS_BASE,

	.end		= EP93XX_CS6_PHYS_BASE + SZ_32M - 1,

	.flags		= IORESOURCE_MEM,

};
@@ -60,7 +60,7 @@ MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board") 
	/* Maintainer: Toufeeq Hussain <toufeeq_hussain@infosys.com> */

	.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,