Skip to content

Commit

Permalink
[ARM] 5342/1: ep93xx: platform init cleanup
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Hartley Sweeten authored and Russell King committed Dec 13, 2008
1 parent 854feae commit e48f3fa
Show file tree
Hide file tree
Showing 10 changed files with 83 additions and 83 deletions.
6 changes: 3 additions & 3 deletions arch/arm/mach-ep93xx/adssphere.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-ep93xx/edb9302.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/mach-ep93xx/edb9302a.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand All @@ -44,7 +44,7 @@ static struct platform_device edb9302a_flash = {
};

static struct ep93xx_eth_data edb9302a_eth_data = {
.phy_id = 1,
.phy_id = 1,
};

static void __init edb9302a_init_machine(void)
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/mach-ep93xx/edb9307.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand All @@ -44,7 +44,7 @@ static struct platform_device edb9307_flash = {
};

static struct ep93xx_eth_data edb9307_eth_data = {
.phy_id = 1,
.phy_id = 1,
};

static void __init edb9307_init_machine(void)
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/mach-ep93xx/edb9312.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand All @@ -45,7 +45,7 @@ static struct platform_device edb9312_flash = {
};

static struct ep93xx_eth_data edb9312_eth_data = {
.phy_id = 1,
.phy_id = 1,
};

static void __init edb9312_init_machine(void)
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/mach-ep93xx/edb9315.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ static struct physmap_flash_data edb9315_flash_data = {
};

static struct resource edb9315_flash_resource = {
.start = 0x60000000,
.end = 0x61ffffff,
.start = EP93XX_CS6_PHYS_BASE,
.end = EP93XX_CS6_PHYS_BASE + SZ_32M - 1,
.flags = IORESOURCE_MEM,
};

Expand All @@ -44,7 +44,7 @@ static struct platform_device edb9315_flash = {
};

static struct ep93xx_eth_data edb9315_eth_data = {
.phy_id = 1,
.phy_id = 1,
};

static void __init edb9315_init_machine(void)
Expand All @@ -59,7 +59,7 @@ MACHINE_START(EDB9315, "Cirrus Logic EDB9315 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 = 0x00000100,
.boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
Expand Down
8 changes: 4 additions & 4 deletions arch/arm/mach-ep93xx/edb9315a.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ static struct physmap_flash_data edb9315a_flash_data = {
};

static struct resource edb9315a_flash_resource = {
.start = 0x60000000,
.end = 0x60ffffff,
.start = EP93XX_CS6_PHYS_BASE,
.end = EP93XX_CS6_PHYS_BASE + SZ_16M - 1,
.flags = IORESOURCE_MEM,
};

Expand All @@ -44,7 +44,7 @@ static struct platform_device edb9315a_flash = {
};

static struct ep93xx_eth_data edb9315a_eth_data = {
.phy_id = 1,
.phy_id = 1,
};

static void __init edb9315a_init_machine(void)
Expand All @@ -59,7 +59,7 @@ MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A 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,
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-ep93xx/gesbc9312.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ static struct physmap_flash_data gesbc9312_flash_data = {
};

static struct resource gesbc9312_flash_resource = {
.start = 0x60000000,
.end = 0x607fffff,
.start = EP93XX_CS6_PHYS_BASE,
.end = EP93XX_CS6_PHYS_BASE + SZ_8M - 1,
.flags = IORESOURCE_MEM,
};

Expand Down Expand Up @@ -59,7 +59,7 @@ MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx")
/* 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,
Expand Down
88 changes: 44 additions & 44 deletions arch/arm/mach-ep93xx/micro9.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <asm/mach-types.h>

static struct ep93xx_eth_data micro9_eth_data = {
.phy_id = 0x1f,
.phy_id = 0x1f,
};

static void __init micro9_init(void)
Expand All @@ -38,46 +38,46 @@ static void __init micro9_init(void)
*/
#ifdef CONFIG_MACH_MICRO9H
static struct physmap_flash_data micro9h_flash_data = {
.width = 4,
.width = 4,
};

static struct resource micro9h_flash_resource = {
.start = 0x10000000,
.end = 0x13ffffff,
.flags = IORESOURCE_MEM,
.start = EP93XX_CS1_PHYS_BASE,
.end = EP93XX_CS1_PHYS_BASE + SZ_64M - 1,
.flags = IORESOURCE_MEM,
};

static struct platform_device micro9h_flash = {
.name = "physmap-flash",
.id = 0,
.dev = {
.platform_data = &micro9h_flash_data,
},
.num_resources = 1,
.resource = &micro9h_flash_resource,
.name = "physmap-flash",
.id = 0,
.dev = {
.platform_data = &micro9h_flash_data,
},
.num_resources = 1,
.resource = &micro9h_flash_resource,
};

static void __init micro9h_init(void)
{
platform_device_register(&micro9h_flash);
platform_device_register(&micro9h_flash);
}

static void __init micro9h_init_machine(void)
{
ep93xx_init_devices();
micro9_init();
micro9h_init();
ep93xx_init_devices();
micro9_init();
micro9h_init();
}

MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H")
/* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */
.phys_io = EP93XX_APB_PHYS_BASE,
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
.boot_params = 0x00000100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
.init_machine = micro9h_init_machine,
/* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */
.phys_io = EP93XX_APB_PHYS_BASE,
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
.boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
.init_machine = micro9h_init_machine,
MACHINE_END
#endif

Expand All @@ -87,19 +87,19 @@ MACHINE_END
#ifdef CONFIG_MACH_MICRO9M
static void __init micro9m_init_machine(void)
{
ep93xx_init_devices();
micro9_init();
ep93xx_init_devices();
micro9_init();
}

MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M")
/* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */
.phys_io = EP93XX_APB_PHYS_BASE,
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
.boot_params = 0x00000100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
.init_machine = micro9m_init_machine,
/* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */
.phys_io = EP93XX_APB_PHYS_BASE,
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
.boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
.init_machine = micro9m_init_machine,
MACHINE_END
#endif

Expand All @@ -109,19 +109,19 @@ MACHINE_END
#ifdef CONFIG_MACH_MICRO9L
static void __init micro9l_init_machine(void)
{
ep93xx_init_devices();
micro9_init();
ep93xx_init_devices();
micro9_init();
}

MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L")
/* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */
.phys_io = EP93XX_APB_PHYS_BASE,
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
.boot_params = 0x00000100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
.init_machine = micro9l_init_machine,
/* Maintainer: Manfred Gruber <manfred.gruber@contec.at> */
.phys_io = EP93XX_APB_PHYS_BASE,
.io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc,
.boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,
.map_io = ep93xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
.init_machine = micro9l_init_machine,
MACHINE_END
#endif

20 changes: 10 additions & 10 deletions arch/arm/mach-ep93xx/ts72xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ static struct physmap_flash_data ts72xx_flash_data = {

static struct resource ts72xx_flash_resource = {
.start = TS72XX_NOR_PHYS_BASE,
.end = TS72XX_NOR_PHYS_BASE + 0x00ffffff,
.end = TS72XX_NOR_PHYS_BASE + SZ_16M - 1,
.flags = IORESOURCE_MEM,
};

Expand All @@ -144,21 +144,21 @@ static void ts72xx_rtc_writebyte(unsigned char value, unsigned long addr)
}

static struct m48t86_ops ts72xx_rtc_ops = {
.readbyte = ts72xx_rtc_readbyte,
.writebyte = ts72xx_rtc_writebyte,
.readbyte = ts72xx_rtc_readbyte,
.writebyte = ts72xx_rtc_writebyte,
};

static struct platform_device ts72xx_rtc_device = {
.name = "rtc-m48t86",
.id = -1,
.dev = {
.platform_data = &ts72xx_rtc_ops,
.name = "rtc-m48t86",
.id = -1,
.dev = {
.platform_data = &ts72xx_rtc_ops,
},
.num_resources = 0,
.num_resources = 0,
};

static struct ep93xx_eth_data ts72xx_eth_data = {
.phy_id = 1,
.phy_id = 1,
};

static void __init ts72xx_init_machine(void)
Expand All @@ -175,7 +175,7 @@ MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC")
/* 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 = ts72xx_map_io,
.init_irq = ep93xx_init_irq,
.timer = &ep93xx_timer,
Expand Down

0 comments on commit e48f3fa

Please sign in to comment.