Skip to content

L
linux
Commit a181099e authored by Russell King's avatar Russell King
Browse files
Options

ARM: sa11x0: convert to use DEFINE_RES_xxx macros 

Convert StrongARM-11x0 platforms and core SoC code to use the
DEFINE_RES_xxx macros.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 80ea2065
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 257 deletions
arch/arm/mach-sa1100/assabet.c
View file @ a181099e
...@@ -152,15 +152,8 @@ static struct flash_platform_data assabet_flash_data = { ...@@ -152,15 +152,8 @@ static struct flash_platform_data assabet_flash_data = {
}; };
static struct resource assabet_flash_resources[] = { static struct resource assabet_flash_resources[] = {
{ DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M),
.start = SA1100_CS0_PHYS, DEFINE_RES_MEM(SA1100_CS1_PHYS, SZ_32M),
.end = SA1100_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
}, {
.start = SA1100_CS1_PHYS,
.end = SA1100_CS1_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
}
}; };
......
arch/arm/mach-sa1100/badge4.c
View file @ a181099e
...@@ -39,16 +39,8 @@ ...@@ -39,16 +39,8 @@
#include "generic.h" #include "generic.h"
static struct resource sa1111_resources[] = { static struct resource sa1111_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(BADGE4_SA1111_BASE, 0x2000),
.start = BADGE4_SA1111_BASE, [1] = DEFINE_RES_IRQ(BADGE4_IRQ_GPIO_SA1111),
.end = BADGE4_SA1111_BASE + 0x00001fff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = BADGE4_IRQ_GPIO_SA1111,
.end = BADGE4_IRQ_GPIO_SA1111,
.flags = IORESOURCE_IRQ,
},
}; };
static struct sa1111_platform_data sa1111_info = { static struct sa1111_platform_data sa1111_info = {
...@@ -121,11 +113,8 @@ static struct flash_platform_data badge4_flash_data = { ...@@ -121,11 +113,8 @@ static struct flash_platform_data badge4_flash_data = {
.nr_parts = ARRAY_SIZE(badge4_partitions), .nr_parts = ARRAY_SIZE(badge4_partitions),
}; };
static struct resource badge4_flash_resource = { static struct resource badge4_flash_resource =
.start = SA1100_CS0_PHYS, DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_64M);
.end = SA1100_CS0_PHYS + SZ_64M - 1,
.flags = IORESOURCE_MEM,
};
static int five_v_on __initdata = 0; static int five_v_on __initdata = 0;
......
arch/arm/mach-sa1100/cerf.c
View file @ a181099e
...@@ -33,11 +33,7 @@ ...@@ -33,11 +33,7 @@
#include "generic.h" #include "generic.h"
static struct resource cerfuart2_resources[] = { static struct resource cerfuart2_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(0x80030000, SZ_64K),
.start = 0x80030000,
.end = 0x8003ffff,
.flags = IORESOURCE_MEM,
},
}; };
static struct platform_device cerfuart2_device = { static struct platform_device cerfuart2_device = {
...@@ -87,11 +83,8 @@ static struct flash_platform_data cerf_flash_data = { ...@@ -87,11 +83,8 @@ static struct flash_platform_data cerf_flash_data = {
.nr_parts = ARRAY_SIZE(cerf_partitions), .nr_parts = ARRAY_SIZE(cerf_partitions),
}; };
static struct resource cerf_flash_resource = { static struct resource cerf_flash_resource =
.start = SA1100_CS0_PHYS, DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M);
.end = SA1100_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
};
static void __init cerf_init_irq(void) static void __init cerf_init_irq(void)
{ {
......
arch/arm/mach-sa1100/collie.c
View file @ a181099e
...@@ -48,11 +48,7 @@ ...@@ -48,11 +48,7 @@
#include "generic.h" #include "generic.h"
static struct resource collie_scoop_resources[] = { static struct resource collie_scoop_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(0x40800000, SZ_4K),
.start = 0x40800000,
.end = 0x40800fff,
.flags = IORESOURCE_MEM,
},
}; };
static struct scoop_config collie_scoop_setup = { static struct scoop_config collie_scoop_setup = {
...@@ -221,16 +217,8 @@ device_initcall(collie_uart_init); ...@@ -221,16 +217,8 @@ device_initcall(collie_uart_init);
static struct resource locomo_resources[] = { static struct resource locomo_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(0x40000000, SZ_8K),
.start = 0x40000000, [1] = DEFINE_RES_IRQ(IRQ_GPIO25),
.end = 0x40001fff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_GPIO25,
.end = IRQ_GPIO25,
.flags = IORESOURCE_IRQ,
},
}; };
static struct locomo_platform_data locomo_info = { static struct locomo_platform_data locomo_info = {
...@@ -303,11 +291,7 @@ static struct flash_platform_data collie_flash_data = { ...@@ -303,11 +291,7 @@ static struct flash_platform_data collie_flash_data = {
}; };
static struct resource collie_flash_resources[] = { static struct resource collie_flash_resources[] = {
{ DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M),
.start = SA1100_CS0_PHYS,
.end = SA1100_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
}
}; };
static void __init collie_init(void) static void __init collie_init(void)
......
arch/arm/mach-sa1100/generic.c
View file @ a181099e
...@@ -149,16 +149,8 @@ static void sa11x0_register_device(struct platform_device *dev, void *data) ...@@ -149,16 +149,8 @@ static void sa11x0_register_device(struct platform_device *dev, void *data)
static struct resource sa11x0udc_resources[] = { static struct resource sa11x0udc_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(__PREG(Ser0UDCCR), SZ_64K),
.start = __PREG(Ser0UDCCR), [1] = DEFINE_RES_IRQ(IRQ_Ser0UDC),
.end = __PREG(Ser0UDCCR) + 0xffff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_Ser0UDC,
.end = IRQ_Ser0UDC,
.flags = IORESOURCE_IRQ,
},
}; };
static u64 sa11x0udc_dma_mask = 0xffffffffUL; static u64 sa11x0udc_dma_mask = 0xffffffffUL;
...@@ -175,16 +167,8 @@ static struct platform_device sa11x0udc_device = { ...@@ -175,16 +167,8 @@ static struct platform_device sa11x0udc_device = {
}; };
static struct resource sa11x0uart1_resources[] = { static struct resource sa11x0uart1_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(__PREG(Ser1UTCR0), SZ_64K),
.start = __PREG(Ser1UTCR0), [1] = DEFINE_RES_IRQ(IRQ_Ser1UART),
.end = __PREG(Ser1UTCR0) + 0xffff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_Ser1UART,
.end = IRQ_Ser1UART,
.flags = IORESOURCE_IRQ,
},
}; };
static struct platform_device sa11x0uart1_device = { static struct platform_device sa11x0uart1_device = {
...@@ -195,16 +179,8 @@ static struct platform_device sa11x0uart1_device = { ...@@ -195,16 +179,8 @@ static struct platform_device sa11x0uart1_device = {
}; };
static struct resource sa11x0uart3_resources[] = { static struct resource sa11x0uart3_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(__PREG(Ser3UTCR0), SZ_64K),
.start = __PREG(Ser3UTCR0), [1] = DEFINE_RES_IRQ(IRQ_Ser3UART),
.end = __PREG(Ser3UTCR0) + 0xffff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_Ser3UART,
.end = IRQ_Ser3UART,
.flags = IORESOURCE_IRQ,
},
}; };
static struct platform_device sa11x0uart3_device = { static struct platform_device sa11x0uart3_device = {
...@@ -215,16 +191,8 @@ static struct platform_device sa11x0uart3_device = { ...@@ -215,16 +191,8 @@ static struct platform_device sa11x0uart3_device = {
}; };
static struct resource sa11x0mcp_resources[] = { static struct resource sa11x0mcp_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(__PREG(Ser4MCCR0), SZ_64K),
.start = __PREG(Ser4MCCR0), [1] = DEFINE_RES_IRQ(IRQ_Ser4MCP),
.end = __PREG(Ser4MCCR0) + 0xffff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_Ser4MCP,
.end = IRQ_Ser4MCP,
.flags = IORESOURCE_IRQ,
},
}; };
static u64 sa11x0mcp_dma_mask = 0xffffffffUL; static u64 sa11x0mcp_dma_mask = 0xffffffffUL;
...@@ -246,16 +214,8 @@ void sa11x0_register_mcp(struct mcp_plat_data *data) ...@@ -246,16 +214,8 @@ void sa11x0_register_mcp(struct mcp_plat_data *data)
} }
static struct resource sa11x0ssp_resources[] = { static struct resource sa11x0ssp_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(0x80070000, SZ_64K),
.start = 0x80070000, [1] = DEFINE_RES_IRQ(IRQ_Ser4SSP),
.end = 0x8007ffff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_Ser4SSP,
.end = IRQ_Ser4SSP,
.flags = IORESOURCE_IRQ,
},
}; };
static u64 sa11x0ssp_dma_mask = 0xffffffffUL; static u64 sa11x0ssp_dma_mask = 0xffffffffUL;
...@@ -272,16 +232,8 @@ static struct platform_device sa11x0ssp_device = { ...@@ -272,16 +232,8 @@ static struct platform_device sa11x0ssp_device = {
}; };
static struct resource sa11x0fb_resources[] = { static struct resource sa11x0fb_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(0xb0100000, SZ_64K),
.start = 0xb0100000, [1] = DEFINE_RES_IRQ(IRQ_LCD),
.end = 0xb010ffff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_LCD,
.end = IRQ_LCD,
.flags = IORESOURCE_IRQ,
},
}; };
static struct platform_device sa11x0fb_device = { static struct platform_device sa11x0fb_device = {
...@@ -314,23 +266,10 @@ void sa11x0_register_mtd(struct flash_platform_data *flash, ...@@ -314,23 +266,10 @@ void sa11x0_register_mtd(struct flash_platform_data *flash,
} }
static struct resource sa11x0ir_resources[] = { static struct resource sa11x0ir_resources[] = {
{ DEFINE_RES_MEM(__PREG(Ser2UTCR0), 0x24),
.start = __PREG(Ser2UTCR0), DEFINE_RES_MEM(__PREG(Ser2HSCR0), 0x1c),
.end = __PREG(Ser2UTCR0) + 0x24 - 1, DEFINE_RES_MEM(__PREG(Ser2HSCR2), 0x04),
.flags = IORESOURCE_MEM, DEFINE_RES_IRQ(IRQ_Ser2ICP),
}, {
.start = __PREG(Ser2HSCR0),
.end = __PREG(Ser2HSCR0) + 0x1c - 1,
.flags = IORESOURCE_MEM,
}, {
.start = __PREG(Ser2HSCR2),
.end = __PREG(Ser2HSCR2) + 0x04 - 1,
.flags = IORESOURCE_MEM,
}, {
.start = IRQ_Ser2ICP,
.end = IRQ_Ser2ICP,
.flags = IORESOURCE_IRQ,
}
}; };
static struct platform_device sa11x0ir_device = { static struct platform_device sa11x0ir_device = {
......
arch/arm/mach-sa1100/h3xxx.c
View file @ a181099e
...@@ -109,11 +109,8 @@ static struct flash_platform_data h3xxx_flash_data = { ...@@ -109,11 +109,8 @@ static struct flash_platform_data h3xxx_flash_data = {
.nr_parts = ARRAY_SIZE(h3xxx_partitions), .nr_parts = ARRAY_SIZE(h3xxx_partitions),
}; };
static struct resource h3xxx_flash_resource = { static struct resource h3xxx_flash_resource =
.start = SA1100_CS0_PHYS, DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M);
.end = SA1100_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
};
/* /*
...@@ -186,11 +183,7 @@ static struct sa1100_port_fns h3xxx_port_fns __initdata = { ...@@ -186,11 +183,7 @@ static struct sa1100_port_fns h3xxx_port_fns __initdata = {
*/ */
static struct resource egpio_resources[] = { static struct resource egpio_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(H3600_EGPIO_PHYS, 0x4),
.start = H3600_EGPIO_PHYS,
.end = H3600_EGPIO_PHYS + 0x4 - 1,
.flags = IORESOURCE_MEM,
},
}; };
static struct htc_egpio_chip egpio_chips[] = { static struct htc_egpio_chip egpio_chips[] = {
......
arch/arm/mach-sa1100/hackkit.c
View file @ a181099e
...@@ -179,11 +179,8 @@ static struct flash_platform_data hackkit_flash_data = { ...@@ -179,11 +179,8 @@ static struct flash_platform_data hackkit_flash_data = {
.nr_parts = ARRAY_SIZE(hackkit_partitions), .nr_parts = ARRAY_SIZE(hackkit_partitions),
}; };
static struct resource hackkit_flash_resource = { static struct resource hackkit_flash_resource =
.start = SA1100_CS0_PHYS, DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M);
.end = SA1100_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
};
static void __init hackkit_init(void) static void __init hackkit_init(void)
{ {
......
arch/arm/mach-sa1100/irq.c
View file @ a181099e
...@@ -221,11 +221,8 @@ static struct irq_chip sa1100_normal_chip = { ...@@ -221,11 +221,8 @@ static struct irq_chip sa1100_normal_chip = {
.irq_set_wake = sa1100_set_wake, .irq_set_wake = sa1100_set_wake,
}; };
static struct resource irq_resource = { static struct resource irq_resource =
.name = "irqs", DEFINE_RES_MEM_NAMED(0x90050000, SZ_64K, "irqs");
.start = 0x90050000,
.end = 0x9005ffff,
};
static struct sa1100irq_state { static struct sa1100irq_state {
unsigned int saved; unsigned int saved;
......
arch/arm/mach-sa1100/jornada720.c
View file @ a181099e
...@@ -174,16 +174,8 @@ static struct s1d13xxxfb_pdata s1d13xxxfb_data = { ...@@ -174,16 +174,8 @@ static struct s1d13xxxfb_pdata s1d13xxxfb_data = {
}; };
static struct resource s1d13xxxfb_resources[] = { static struct resource s1d13xxxfb_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(EPSONFBSTART, EPSONFBLEN),
.start = EPSONFBSTART, [1] = DEFINE_RES_MEM(EPSONREGSTART, EPSONREGLEN),
.end = EPSONFBSTART + EPSONFBLEN - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = EPSONREGSTART,
.end = EPSONREGSTART + EPSONREGLEN - 1,
.flags = IORESOURCE_MEM,
}
}; };
static struct platform_device s1d13xxxfb_device = { static struct platform_device s1d13xxxfb_device = {
...@@ -197,16 +189,8 @@ static struct platform_device s1d13xxxfb_device = { ...@@ -197,16 +189,8 @@ static struct platform_device s1d13xxxfb_device = {
}; };
static struct resource sa1111_resources[] = { static struct resource sa1111_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(SA1111REGSTART, SA1111REGLEN),
.start = SA1111REGSTART, [1] = DEFINE_RES_IRQ(IRQ_GPIO1),
.end = SA1111REGSTART + SA1111REGLEN - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_GPIO1,
.end = IRQ_GPIO1,
.flags = IORESOURCE_IRQ,
},
}; };
static struct sa1111_platform_data sa1111_info = { static struct sa1111_platform_data sa1111_info = {
...@@ -352,11 +336,8 @@ static struct flash_platform_data jornada720_flash_data = { ...@@ -352,11 +336,8 @@ static struct flash_platform_data jornada720_flash_data = {
.nr_parts = ARRAY_SIZE(jornada720_partitions), .nr_parts = ARRAY_SIZE(jornada720_partitions),
}; };
static struct resource jornada720_flash_resource = { static struct resource jornada720_flash_resource =
.start = SA1100_CS0_PHYS, DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M);
.end = SA1100_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
};
static void __init jornada720_mach_init(void) static void __init jornada720_mach_init(void)
{ {
......
arch/arm/mach-sa1100/nanoengine.c
View file @ a181099e
...@@ -58,15 +58,8 @@ static struct flash_platform_data nanoengine_flash_data = { ...@@ -58,15 +58,8 @@ static struct flash_platform_data nanoengine_flash_data = {
}; };
static struct resource nanoengine_flash_resources[] = { static struct resource nanoengine_flash_resources[] = {
{ DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M),
.start = SA1100_CS0_PHYS, DEFINE_RES_MEM(SA1100_CS1_PHYS, SZ_32M),
.end = SA1100_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
}, {
.start = SA1100_CS1_PHYS,
.end = SA1100_CS1_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
}
}; };
static struct map_desc nanoengine_io_desc[] __initdata = { static struct map_desc nanoengine_io_desc[] __initdata = {
......
arch/arm/mach-sa1100/neponset.c
View file @ a181099e
...@@ -213,11 +213,7 @@ static struct platform_driver neponset_device_driver = { ...@@ -213,11 +213,7 @@ static struct platform_driver neponset_device_driver = {
}; };
static struct resource neponset_resources[] = { static struct resource neponset_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(0x10000000, 0x08000000),
.start = 0x10000000,
.end = 0x17ffffff,
.flags = IORESOURCE_MEM,
},
}; };
static struct platform_device neponset_device = { static struct platform_device neponset_device = {
...@@ -228,16 +224,8 @@ static struct platform_device neponset_device = { ...@@ -228,16 +224,8 @@ static struct platform_device neponset_device = {
}; };
static struct resource sa1111_resources[] = { static struct resource sa1111_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(0x40000000, SZ_8K),
.start = 0x40000000, [1] = DEFINE_RES_IRQ(IRQ_NEPONSET_SA1111),
.end = 0x40001fff,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_NEPONSET_SA1111,
.end = IRQ_NEPONSET_SA1111,
.flags = IORESOURCE_IRQ,
},
}; };
static struct sa1111_platform_data sa1111_info = { static struct sa1111_platform_data sa1111_info = {
...@@ -259,23 +247,10 @@ static struct platform_device sa1111_device = { ...@@ -259,23 +247,10 @@ static struct platform_device sa1111_device = {
}; };
static struct resource smc91x_resources[] = { static struct resource smc91x_resources[] = {
[0] = { [0] = DEFINE_RES_MEM_NAMED(SA1100_CS3_PHYS, 0x02000000, "smc91x-regs"),
.name = "smc91x-regs", [1] = DEFINE_RES_IRQ(IRQ_NEPONSET_SMC9196),
.start = SA1100_CS3_PHYS, [2] = DEFINE_RES_MEM_NAMED(SA1100_CS3_PHYS + 0x02000000,
.end = SA1100_CS3_PHYS + 0x01ffffff, 0x02000000, "smc91x-attrib"),
.flags = IORESOURCE_MEM,
},
[1] = {
.start = IRQ_NEPONSET_SMC9196,
.end = IRQ_NEPONSET_SMC9196,
.flags = IORESOURCE_IRQ,
},
[2] = {
.name = "smc91x-attrib",
.start = SA1100_CS3_PHYS + 0x02000000,
.end = SA1100_CS3_PHYS + 0x03ffffff,
.flags = IORESOURCE_MEM,
},
}; };
static struct platform_device smc91x_device = { static struct platform_device smc91x_device = {
......
arch/arm/mach-sa1100/pci-nanoengine.c
View file @ a181099e
...@@ -135,12 +135,8 @@ struct pci_bus * __init pci_nanoengine_scan_bus(int nr, struct pci_sys_data *sys ...@@ -135,12 +135,8 @@ struct pci_bus * __init pci_nanoengine_scan_bus(int nr, struct pci_sys_data *sys
&sys->resources); &sys->resources);
} }
static struct resource pci_io_ports = { static struct resource pci_io_ports =
.name = "PCI IO", DEFINE_RES_IO_NAMED(0x400, 0x400, "PCI IO");
.start = 0x400,
.end = 0x7FF,
.flags = IORESOURCE_IO,
};
static struct resource pci_non_prefetchable_memory = { static struct resource pci_non_prefetchable_memory = {
.name = "PCI non-prefetchable", .name = "PCI non-prefetchable",
......
arch/arm/mach-sa1100/pleb.c
View file @ a181099e
...@@ -37,17 +37,9 @@ ...@@ -37,17 +37,9 @@
#define IRQ_GPIO_ETH0_IRQ IRQ_GPIO21 #define IRQ_GPIO_ETH0_IRQ IRQ_GPIO21
static struct resource smc91x_resources[] = { static struct resource smc91x_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(PLEB_ETH0_P, 0x04000000),
.start = PLEB_ETH0_P,
.end = PLEB_ETH0_P | 0x03ffffff,
.flags = IORESOURCE_MEM,
},
#if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */ #if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */
[1] = { [1] = DEFINE_RES_IRQ(IRQ_GPIO_ETH0_IRQ),
.start = IRQ_GPIO_ETH0_IRQ,
.end = IRQ_GPIO_ETH0_IRQ,
.flags = IORESOURCE_IRQ,
},
#endif #endif
}; };
...@@ -70,16 +62,8 @@ static struct platform_device *devices[] __initdata = { ...@@ -70,16 +62,8 @@ static struct platform_device *devices[] __initdata = {
* the two SA1100 lowest chip select outputs. * the two SA1100 lowest chip select outputs.
*/ */
static struct resource pleb_flash_resources[] = { static struct resource pleb_flash_resources[] = {
[0] = { [0] = DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_8M),
.start = SA1100_CS0_PHYS, [1] = DEFINE_RES_MEM(SA1100_CS1_PHYS, SZ_8M),
.end = SA1100_CS0_PHYS + SZ_8M - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = SA1100_CS1_PHYS,
.end = SA1100_CS1_PHYS + SZ_8M - 1,
.flags = IORESOURCE_MEM,
}
}; };
......
arch/arm/mach-sa1100/shannon.c
View file @ a181099e
...@@ -46,11 +46,8 @@ static struct flash_platform_data shannon_flash_data = { ...@@ -46,11 +46,8 @@ static struct flash_platform_data shannon_flash_data = {
.nr_parts = ARRAY_SIZE(shannon_partitions), .nr_parts = ARRAY_SIZE(shannon_partitions),
}; };
static struct resource shannon_flash_resource = { static struct resource shannon_flash_resource =
.start = SA1100_CS0_PHYS, DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_4M);
.end = SA1100_CS0_PHYS + SZ_4M - 1,
.flags = IORESOURCE_MEM,
};
static struct mcp_plat_data shannon_mcp_data = { static struct mcp_plat_data shannon_mcp_data = {
.mccr0 = MCCR0_ADM, .mccr0 = MCCR0_ADM,
......
arch/arm/mach-sa1100/simpad.c
View file @ a181099e
...@@ -176,15 +176,8 @@ static struct flash_platform_data simpad_flash_data = { ...@@ -176,15 +176,8 @@ static struct flash_platform_data simpad_flash_data = {
static struct resource simpad_flash_resources [] = { static struct resource simpad_flash_resources [] = {
{ DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_16M),
.start = SA1100_CS0_PHYS, DEFINE_RES_MEM(SA1100_CS1_PHYS, SZ_16M),
.end = SA1100_CS0_PHYS + SZ_16M -1,
.flags = IORESOURCE_MEM,
}, {
.start = SA1100_CS1_PHYS,
.end = SA1100_CS1_PHYS + SZ_16M -1,
.flags = IORESOURCE_MEM,
}
}; };
static struct mcp_plat_data simpad_mcp_data = { static struct mcp_plat_data simpad_mcp_data = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7