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-s3c2440 | |
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-s3c2440')
-rw-r--r-- | arch/arm/mach-s3c2440/mach-anubis.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-at2440evb.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-mini2440.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-nexcoder.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-rx1950.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-rx3715.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-smdk2440.c | 2 |
9 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index b73f78a9da5c..d7086788b1ff 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
@@ -498,8 +498,6 @@ static void __init anubis_init(void) | |||
498 | 498 | ||
499 | MACHINE_START(ANUBIS, "Simtec-Anubis") | 499 | MACHINE_START(ANUBIS, "Simtec-Anubis") |
500 | /* Maintainer: Ben Dooks <ben@simtec.co.uk> */ | 500 | /* Maintainer: Ben Dooks <ben@simtec.co.uk> */ |
501 | .phys_io = S3C2410_PA_UART, | ||
502 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
503 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 501 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
504 | .map_io = anubis_map_io, | 502 | .map_io = anubis_map_io, |
505 | .init_machine = anubis_init, | 503 | .init_machine = anubis_init, |
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index 84725791e6bf..e3810c86a5e6 100644 --- a/arch/arm/mach-s3c2440/mach-at2440evb.c +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c | |||
@@ -233,8 +233,6 @@ static void __init at2440evb_init(void) | |||
233 | 233 | ||
234 | 234 | ||
235 | MACHINE_START(AT2440EVB, "AT2440EVB") | 235 | MACHINE_START(AT2440EVB, "AT2440EVB") |
236 | .phys_io = S3C2410_PA_UART, | ||
237 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
238 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 236 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
239 | .map_io = at2440evb_map_io, | 237 | .map_io = at2440evb_map_io, |
240 | .init_machine = at2440evb_init, | 238 | .init_machine = at2440evb_init, |
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index deaabe86741d..9f2c14ec7181 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c | |||
@@ -572,8 +572,6 @@ static void __init gta02_machine_init(void) | |||
572 | 572 | ||
573 | MACHINE_START(NEO1973_GTA02, "GTA02") | 573 | MACHINE_START(NEO1973_GTA02, "GTA02") |
574 | /* Maintainer: Nelson Castillo <arhuaco@freaks-unidos.net> */ | 574 | /* Maintainer: Nelson Castillo <arhuaco@freaks-unidos.net> */ |
575 | .phys_io = S3C2410_PA_UART, | ||
576 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
577 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 575 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
578 | .map_io = gta02_map_io, | 576 | .map_io = gta02_map_io, |
579 | .init_irq = s3c24xx_init_irq, | 577 | .init_irq = s3c24xx_init_irq, |
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c index a76bcda210ad..f62bb4c793bd 100644 --- a/arch/arm/mach-s3c2440/mach-mini2440.c +++ b/arch/arm/mach-s3c2440/mach-mini2440.c | |||
@@ -691,8 +691,6 @@ static void __init mini2440_init(void) | |||
691 | 691 | ||
692 | MACHINE_START(MINI2440, "MINI2440") | 692 | MACHINE_START(MINI2440, "MINI2440") |
693 | /* Maintainer: Michel Pollet <buserror@gmail.com> */ | 693 | /* Maintainer: Michel Pollet <buserror@gmail.com> */ |
694 | .phys_io = S3C2410_PA_UART, | ||
695 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
696 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 694 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
697 | .map_io = mini2440_map_io, | 695 | .map_io = mini2440_map_io, |
698 | .init_machine = mini2440_init, | 696 | .init_machine = mini2440_init, |
diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c index 3ff62de45fde..37dd306fb7dc 100644 --- a/arch/arm/mach-s3c2440/mach-nexcoder.c +++ b/arch/arm/mach-s3c2440/mach-nexcoder.c | |||
@@ -151,8 +151,6 @@ static void __init nexcoder_init(void) | |||
151 | 151 | ||
152 | MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") | 152 | MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") |
153 | /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */ | 153 | /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */ |
154 | .phys_io = S3C2410_PA_UART, | ||
155 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
156 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 154 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
157 | .map_io = nexcoder_map_io, | 155 | .map_io = nexcoder_map_io, |
158 | .init_machine = nexcoder_init, | 156 | .init_machine = nexcoder_init, |
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 319458da71a0..14dc67897757 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
@@ -455,8 +455,6 @@ static void __init osiris_init(void) | |||
455 | 455 | ||
456 | MACHINE_START(OSIRIS, "Simtec-OSIRIS") | 456 | MACHINE_START(OSIRIS, "Simtec-OSIRIS") |
457 | /* Maintainer: Ben Dooks <ben@simtec.co.uk> */ | 457 | /* Maintainer: Ben Dooks <ben@simtec.co.uk> */ |
458 | .phys_io = S3C2410_PA_UART, | ||
459 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
460 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 458 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
461 | .map_io = osiris_map_io, | 459 | .map_io = osiris_map_io, |
462 | .init_irq = s3c24xx_init_irq, | 460 | .init_irq = s3c24xx_init_irq, |
diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c index 142d1f921176..32019bd9db3b 100644 --- a/arch/arm/mach-s3c2440/mach-rx1950.c +++ b/arch/arm/mach-s3c2440/mach-rx1950.c | |||
@@ -580,8 +580,6 @@ static void __init rx1950_reserve(void) | |||
580 | 580 | ||
581 | MACHINE_START(RX1950, "HP iPAQ RX1950") | 581 | MACHINE_START(RX1950, "HP iPAQ RX1950") |
582 | /* Maintainers: Vasily Khoruzhick */ | 582 | /* Maintainers: Vasily Khoruzhick */ |
583 | .phys_io = S3C2410_PA_UART, | ||
584 | .io_pg_offst = (((u32) S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
585 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 583 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
586 | .map_io = rx1950_map_io, | 584 | .map_io = rx1950_map_io, |
587 | .reserve = rx1950_reserve, | 585 | .reserve = rx1950_reserve, |
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index 6bb44f75a9ce..1472b1a5b2fb 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c | |||
@@ -218,8 +218,6 @@ static void __init rx3715_init_machine(void) | |||
218 | 218 | ||
219 | MACHINE_START(RX3715, "IPAQ-RX3715") | 219 | MACHINE_START(RX3715, "IPAQ-RX3715") |
220 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ | 220 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ |
221 | .phys_io = S3C2410_PA_UART, | ||
222 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
223 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 221 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
224 | .map_io = rx3715_map_io, | 222 | .map_io = rx3715_map_io, |
225 | .reserve = rx3715_reserve, | 223 | .reserve = rx3715_reserve, |
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c index df83276d85ae..eedfe0f11643 100644 --- a/arch/arm/mach-s3c2440/mach-smdk2440.c +++ b/arch/arm/mach-s3c2440/mach-smdk2440.c | |||
@@ -175,8 +175,6 @@ static void __init smdk2440_machine_init(void) | |||
175 | 175 | ||
176 | MACHINE_START(S3C2440, "SMDK2440") | 176 | MACHINE_START(S3C2440, "SMDK2440") |
177 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ | 177 | /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ |
178 | .phys_io = S3C2410_PA_UART, | ||
179 | .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, | ||
180 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 178 | .boot_params = S3C2410_SDRAM_PA + 0x100, |
181 | 179 | ||
182 | .init_irq = s3c24xx_init_irq, | 180 | .init_irq = s3c24xx_init_irq, |