diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-10-14 22:21:46 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2010-10-20 00:27:46 -0400 |
commit | 6451d7783ba5ff24eb1a544eaa6665b890f30466 (patch) | |
tree | 78651bbbed163fe933cd42deabebad682d7c03dc /arch/arm/mach-ixp2000 | |
parent | c293393faa8e11a5a80a9e358718432b8697f451 (diff) |
arm: remove machine_desc.io_pg_offst and .phys_io
Since we're now using addruart to establish the debug mapping, we can
remove the io_pg_offst and phys_io members of struct machine_desc.
The various declarations were removed using the following script:
grep -rl MACHINE_START arch/arm | xargs \
sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'
[ Initial patch was from Jeremy Kerr, example script from Russell King ]
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Eric Miao <eric.miao at canonical.com>
Diffstat (limited to 'arch/arm/mach-ixp2000')
-rw-r--r-- | arch/arm/mach-ixp2000/enp2611.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2400.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2800.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x01.c | 6 |
4 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c index 1a557e0d055b..88663ab1d2ad 100644 --- a/arch/arm/mach-ixp2000/enp2611.c +++ b/arch/arm/mach-ixp2000/enp2611.c | |||
@@ -253,8 +253,6 @@ static void __init enp2611_init_machine(void) | |||
253 | 253 | ||
254 | MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board") | 254 | MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board") |
255 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 255 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
256 | .phys_io = IXP2000_UART_PHYS_BASE, | ||
257 | .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc, | ||
258 | .boot_params = 0x00000100, | 256 | .boot_params = 0x00000100, |
259 | .map_io = enp2611_map_io, | 257 | .map_io = enp2611_map_io, |
260 | .init_irq = ixp2000_init_irq, | 258 | .init_irq = ixp2000_init_irq, |
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c index 55e5c69352ad..dfffc1e817fa 100644 --- a/arch/arm/mach-ixp2000/ixdp2400.c +++ b/arch/arm/mach-ixp2000/ixdp2400.c | |||
@@ -170,8 +170,6 @@ void __init ixdp2400_init_irq(void) | |||
170 | 170 | ||
171 | MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform") | 171 | MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform") |
172 | /* Maintainer: MontaVista Software, Inc. */ | 172 | /* Maintainer: MontaVista Software, Inc. */ |
173 | .phys_io = IXP2000_UART_PHYS_BASE, | ||
174 | .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc, | ||
175 | .boot_params = 0x00000100, | 173 | .boot_params = 0x00000100, |
176 | .map_io = ixdp2x00_map_io, | 174 | .map_io = ixdp2x00_map_io, |
177 | .init_irq = ixdp2400_init_irq, | 175 | .init_irq = ixdp2400_init_irq, |
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c index 237b61a85e9a..cd4c9bcff2b5 100644 --- a/arch/arm/mach-ixp2000/ixdp2800.c +++ b/arch/arm/mach-ixp2000/ixdp2800.c | |||
@@ -285,8 +285,6 @@ void __init ixdp2800_init_irq(void) | |||
285 | 285 | ||
286 | MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform") | 286 | MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform") |
287 | /* Maintainer: MontaVista Software, Inc. */ | 287 | /* Maintainer: MontaVista Software, Inc. */ |
288 | .phys_io = IXP2000_UART_PHYS_BASE, | ||
289 | .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc, | ||
290 | .boot_params = 0x00000100, | 288 | .boot_params = 0x00000100, |
291 | .map_io = ixdp2x00_map_io, | 289 | .map_io = ixdp2x00_map_io, |
292 | .init_irq = ixdp2800_init_irq, | 290 | .init_irq = ixdp2800_init_irq, |
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index 0369ec4242a6..6c121bdbe311 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c | |||
@@ -416,8 +416,6 @@ static void __init ixdp2x01_init_machine(void) | |||
416 | #ifdef CONFIG_ARCH_IXDP2401 | 416 | #ifdef CONFIG_ARCH_IXDP2401 |
417 | MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform") | 417 | MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform") |
418 | /* Maintainer: MontaVista Software, Inc. */ | 418 | /* Maintainer: MontaVista Software, Inc. */ |
419 | .phys_io = IXP2000_UART_PHYS_BASE, | ||
420 | .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc, | ||
421 | .boot_params = 0x00000100, | 419 | .boot_params = 0x00000100, |
422 | .map_io = ixdp2x01_map_io, | 420 | .map_io = ixdp2x01_map_io, |
423 | .init_irq = ixdp2x01_init_irq, | 421 | .init_irq = ixdp2x01_init_irq, |
@@ -429,8 +427,6 @@ MACHINE_END | |||
429 | #ifdef CONFIG_ARCH_IXDP2801 | 427 | #ifdef CONFIG_ARCH_IXDP2801 |
430 | MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform") | 428 | MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform") |
431 | /* Maintainer: MontaVista Software, Inc. */ | 429 | /* Maintainer: MontaVista Software, Inc. */ |
432 | .phys_io = IXP2000_UART_PHYS_BASE, | ||
433 | .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc, | ||
434 | .boot_params = 0x00000100, | 430 | .boot_params = 0x00000100, |
435 | .map_io = ixdp2x01_map_io, | 431 | .map_io = ixdp2x01_map_io, |
436 | .init_irq = ixdp2x01_init_irq, | 432 | .init_irq = ixdp2x01_init_irq, |
@@ -444,8 +440,6 @@ MACHINE_END | |||
444 | */ | 440 | */ |
445 | MACHINE_START(IXDP28X5, "Intel IXDP2805/2855 Development Platform") | 441 | MACHINE_START(IXDP28X5, "Intel IXDP2805/2855 Development Platform") |
446 | /* Maintainer: MontaVista Software, Inc. */ | 442 | /* Maintainer: MontaVista Software, Inc. */ |
447 | .phys_io = IXP2000_UART_PHYS_BASE, | ||
448 | .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc, | ||
449 | .boot_params = 0x00000100, | 443 | .boot_params = 0x00000100, |
450 | .map_io = ixdp2x01_map_io, | 444 | .map_io = ixdp2x01_map_io, |
451 | .init_irq = ixdp2x01_init_irq, | 445 | .init_irq = ixdp2x01_init_irq, |