diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-03 12:38:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-03 12:38:58 -0400 |
| commit | e9dea0c65d2de6981356c055781fb99d7191b14e (patch) | |
| tree | 106e6302238f561e679e479584095d49fe5c66fd /arch/arm/mach-iop3xx/iop331-setup.c | |
| parent | 1d6bebf2ecf92924492c491d9c3a72edba95f907 (diff) | |
[PATCH] ARM: Remove machine description macros
Remove the pointless machine description macros, favouring C99
initialisers instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-iop3xx/iop331-setup.c')
| -rw-r--r-- | arch/arm/mach-iop3xx/iop331-setup.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c index 622e7914819a..fc74b722f72f 100644 --- a/arch/arm/mach-iop3xx/iop331-setup.c +++ b/arch/arm/mach-iop3xx/iop331-setup.c | |||
| @@ -148,26 +148,28 @@ extern void iq80332_map_io(void); | |||
| 148 | 148 | ||
| 149 | #if defined(CONFIG_ARCH_IQ80331) | 149 | #if defined(CONFIG_ARCH_IQ80331) |
| 150 | MACHINE_START(IQ80331, "Intel IQ80331") | 150 | MACHINE_START(IQ80331, "Intel IQ80331") |
| 151 | MAINTAINER("Intel Corp.") | 151 | /* Maintainer: Intel Corp. */ |
| 152 | BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical | 152 | .phys_ram = PHYS_OFFSET, |
| 153 | //BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS) | 153 | .phys_io = 0xfefff000, |
| 154 | MAPIO(iq80331_map_io) | 154 | .io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical |
| 155 | INITIRQ(iop331_init_irq) | 155 | .map_io = iq80331_map_io, |
| 156 | .init_irq = iop331_init_irq, | ||
| 156 | .timer = &iop331_timer, | 157 | .timer = &iop331_timer, |
| 157 | BOOT_PARAMS(0x0100) | 158 | .boot_params = 0x0100, |
| 158 | INIT_MACHINE(iop33x_init) | 159 | .init_machine = iop33x_init, |
| 159 | MACHINE_END | 160 | MACHINE_END |
| 160 | 161 | ||
| 161 | #elif defined(CONFIG_MACH_IQ80332) | 162 | #elif defined(CONFIG_MACH_IQ80332) |
| 162 | MACHINE_START(IQ80332, "Intel IQ80332") | 163 | MACHINE_START(IQ80332, "Intel IQ80332") |
| 163 | MAINTAINER("Intel Corp.") | 164 | /* Maintainer: Intel Corp. */ |
| 164 | BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical | 165 | .phys_ram = PHYS_OFFSET, |
| 165 | //BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS) | 166 | .phys_io = 0xfefff000, |
| 166 | MAPIO(iq80332_map_io) | 167 | .io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical |
| 167 | INITIRQ(iop331_init_irq) | 168 | .map_io = iq80332_map_io, |
| 169 | .init_irq = iop331_init_irq, | ||
| 168 | .timer = &iop331_timer, | 170 | .timer = &iop331_timer, |
| 169 | BOOT_PARAMS(0x0100) | 171 | .boot_params = 0x0100, |
| 170 | INIT_MACHINE(iop33x_init) | 172 | .init_machine = iop33x_init, |
| 171 | MACHINE_END | 173 | MACHINE_END |
| 172 | 174 | ||
| 173 | #else | 175 | #else |