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-realview | |
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-realview')
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb1176.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pba8.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index 991c1f8390e2..f2697106f809 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
@@ -486,8 +486,6 @@ static void __init realview_eb_init(void) | |||
486 | 486 | ||
487 | MACHINE_START(REALVIEW_EB, "ARM-RealView EB") | 487 | MACHINE_START(REALVIEW_EB, "ARM-RealView EB") |
488 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 488 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
489 | .phys_io = REALVIEW_EB_UART0_BASE & SECTION_MASK, | ||
490 | .io_pg_offst = (IO_ADDRESS(REALVIEW_EB_UART0_BASE) >> 18) & 0xfffc, | ||
491 | .boot_params = PHYS_OFFSET + 0x00000100, | 489 | .boot_params = PHYS_OFFSET + 0x00000100, |
492 | .fixup = realview_fixup, | 490 | .fixup = realview_fixup, |
493 | .map_io = realview_eb_map_io, | 491 | .map_io = realview_eb_map_io, |
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c index d2be12eb829e..a4125619d71b 100644 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c | |||
@@ -378,8 +378,6 @@ static void __init realview_pb1176_init(void) | |||
378 | 378 | ||
379 | MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176") | 379 | MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176") |
380 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 380 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
381 | .phys_io = REALVIEW_PB1176_UART0_BASE & SECTION_MASK, | ||
382 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PB1176_UART0_BASE) >> 18) & 0xfffc, | ||
383 | .boot_params = PHYS_OFFSET + 0x00000100, | 381 | .boot_params = PHYS_OFFSET + 0x00000100, |
384 | .fixup = realview_pb1176_fixup, | 382 | .fixup = realview_pb1176_fixup, |
385 | .map_io = realview_pb1176_map_io, | 383 | .map_io = realview_pb1176_map_io, |
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index d591bc00b86e..117b95b2ca15 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
@@ -381,8 +381,6 @@ static void __init realview_pb11mp_init(void) | |||
381 | 381 | ||
382 | MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore") | 382 | MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore") |
383 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 383 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
384 | .phys_io = REALVIEW_PB11MP_UART0_BASE & SECTION_MASK, | ||
385 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE) >> 18) & 0xfffc, | ||
386 | .boot_params = PHYS_OFFSET + 0x00000100, | 384 | .boot_params = PHYS_OFFSET + 0x00000100, |
387 | .fixup = realview_fixup, | 385 | .fixup = realview_fixup, |
388 | .map_io = realview_pb11mp_map_io, | 386 | .map_io = realview_pb11mp_map_io, |
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index 6c37621217bc..929b8dc12e81 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c | |||
@@ -331,8 +331,6 @@ static void __init realview_pba8_init(void) | |||
331 | 331 | ||
332 | MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8") | 332 | MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8") |
333 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 333 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
334 | .phys_io = REALVIEW_PBA8_UART0_BASE & SECTION_MASK, | ||
335 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PBA8_UART0_BASE) >> 18) & 0xfffc, | ||
336 | .boot_params = PHYS_OFFSET + 0x00000100, | 334 | .boot_params = PHYS_OFFSET + 0x00000100, |
337 | .fixup = realview_fixup, | 335 | .fixup = realview_fixup, |
338 | .map_io = realview_pba8_map_io, | 336 | .map_io = realview_pba8_map_io, |
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c index 9428eff0b116..b9f9e20031a7 100644 --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c | |||
@@ -417,8 +417,6 @@ static void __init realview_pbx_init(void) | |||
417 | 417 | ||
418 | MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX") | 418 | MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX") |
419 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 419 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
420 | .phys_io = REALVIEW_PBX_UART0_BASE & SECTION_MASK, | ||
421 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PBX_UART0_BASE) >> 18) & 0xfffc, | ||
422 | .boot_params = PHYS_OFFSET + 0x00000100, | 420 | .boot_params = PHYS_OFFSET + 0x00000100, |
423 | .fixup = realview_pbx_fixup, | 421 | .fixup = realview_pbx_fixup, |
424 | .map_io = realview_pbx_map_io, | 422 | .map_io = realview_pbx_map_io, |