redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

RealView: Move the flash definitions out of platform.h

Browse source 
This patch moves the patch definitions into board-eb.h and
realview_eb.c (from core.c) as they are different on the PB11MPCore
and PB1176 platforms.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Catalin Marinas 2008-04-18 22:43:10 +01:00
parent 073b6ff3b9
commit a44ddfd5bf
5 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/arm/mach-realview/core.c
View file

@ -109,22 +109,21 @@ static struct flash_platform_data realview_flash_data = {
.set_vpp = realview_flash_set_vpp, .set_vpp = realview_flash_set_vpp,
}; };
static struct resource realview_flash_resource = {
.start = REALVIEW_FLASH_BASE,
.end = REALVIEW_FLASH_BASE + REALVIEW_FLASH_SIZE,
.flags = IORESOURCE_MEM,
};
struct platform_device realview_flash_device = { struct platform_device realview_flash_device = {
.name = "armflash", .name = "armflash",
.id = 0, .id = 0,
.dev = { .dev = {
.platform_data = &realview_flash_data, .platform_data = &realview_flash_data,
}, },
.num_resources = 1,
.resource = &realview_flash_resource,
}; };
int realview_flash_register(struct resource *res, u32 num)
{
realview_flash_device.resource = res;
realview_flash_device.num_resources = num;
return platform_device_register(&realview_flash_device);
}
static struct resource realview_i2c_resource = { static struct resource realview_i2c_resource = {
.start = REALVIEW_I2C_BASE, .start = REALVIEW_I2C_BASE,
.end = REALVIEW_I2C_BASE + SZ_4K - 1, .end = REALVIEW_I2C_BASE + SZ_4K - 1,

1
arch/arm/mach-realview/core.h
View file

@ -58,5 +58,6 @@ extern unsigned int twd_size;
extern void realview_leds_event(led_event_t ledevt); extern void realview_leds_event(led_event_t ledevt);
extern void realview_timer_init(unsigned int timer_irq); extern void realview_timer_init(unsigned int timer_irq);
extern int realview_flash_register(struct resource *res, u32 num);
#endif #endif

7
arch/arm/mach-realview/realview_eb.c
View file

@ -223,6 +223,11 @@ static struct amba_device *amba_devs[] __initdata = {
/* /*
* RealView EB platform devices * RealView EB platform devices
*/ */
static struct resource realview_eb_flash_resource = {
.start = REALVIEW_EB_FLASH_BASE,
.end = REALVIEW_EB_FLASH_BASE + REALVIEW_EB_FLASH_SIZE - 1,
.flags = IORESOURCE_MEM,
};
static struct resource realview_eb_eth_resources[] = { static struct resource realview_eb_eth_resources[] = {
[0] = { [0] = {
@ -362,7 +367,7 @@ static void __init realview_eb_init(void)
clk_register(&realview_clcd_clk); clk_register(&realview_clcd_clk);
platform_device_register(&realview_flash_device); realview_flash_register(&realview_eb_flash_resource, 1);
platform_device_register(&realview_i2c_device); platform_device_register(&realview_i2c_device);
eth_device_register(); eth_device_register();

3
include/asm-arm/arch-realview/board-eb.h
View file

@ -29,6 +29,9 @@
#define REALVIEW_EB_GIC_CPU_BASE 0x10040000 /* Generic interrupt controller CPU interface */ #define REALVIEW_EB_GIC_CPU_BASE 0x10040000 /* Generic interrupt controller CPU interface */
#define REALVIEW_EB_GIC_DIST_BASE 0x10041000 /* Generic interrupt controller distributor */ #define REALVIEW_EB_GIC_DIST_BASE 0x10041000 /* Generic interrupt controller distributor */
#define REALVIEW_EB_FLASH_BASE 0x40000000
#define REALVIEW_EB_FLASH_SIZE SZ_64M
#ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB #ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB
#define REALVIEW_EB11MP_SCU_BASE 0x10100000 /* SCU registers */ #define REALVIEW_EB11MP_SCU_BASE 0x10100000 /* SCU registers */
#define REALVIEW_EB11MP_GIC_CPU_BASE 0x10100100 /* Generic interrupt controller CPU interface */ #define REALVIEW_EB11MP_GIC_CPU_BASE 0x10100100 /* Generic interrupt controller CPU interface */

3
include/asm-arm/arch-realview/platform.h
View file

@ -32,9 +32,6 @@
#define REALVIEW_SSRAM_BASE /* REALVIEW_SSMC_BASE ? */ #define REALVIEW_SSRAM_BASE /* REALVIEW_SSMC_BASE ? */
#define REALVIEW_SSRAM_SIZE SZ_2M #define REALVIEW_SSRAM_SIZE SZ_2M
#define REALVIEW_FLASH_BASE 0x40000000
#define REALVIEW_FLASH_SIZE SZ_64M
/* /*
* SDRAM * SDRAM
*/ */