diff options
author | Nicolas Pitre <nico@cam.org> | 2006-01-13 15:51:52 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-13 15:51:52 -0500 |
commit | 946d4935fc61e1479f8c057d58c64110bb43d3b0 (patch) | |
tree | fa922ac26c5ba6bd66e6c5095ceee5cb3613ee92 /arch/arm/mach-pxa | |
parent | 2df96b34aae08e0aa688ef7a8444febb8ec44172 (diff) |
[ARM] 3260/1: remove phys_ram from struct machine_desc (part 2)
Patch from Nicolas Pitre
This field is redundent since it must be equal to PHYS_OFFSET anyway.
Now that no code uses it anymore, mark it deprecated and remove all
initializations from the tree.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/corgi.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-pxa/idp.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/poodle.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-pxa/tosa.c | 1 |
7 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index 5a7b873f29b3..7ffd2de8f2f3 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
@@ -342,7 +342,6 @@ static void __init fixup_corgi(struct machine_desc *desc, | |||
342 | 342 | ||
343 | #ifdef CONFIG_MACH_CORGI | 343 | #ifdef CONFIG_MACH_CORGI |
344 | MACHINE_START(CORGI, "SHARP Corgi") | 344 | MACHINE_START(CORGI, "SHARP Corgi") |
345 | .phys_ram = 0xa0000000, | ||
346 | .phys_io = 0x40000000, | 345 | .phys_io = 0x40000000, |
347 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 346 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
348 | .fixup = fixup_corgi, | 347 | .fixup = fixup_corgi, |
@@ -355,7 +354,6 @@ MACHINE_END | |||
355 | 354 | ||
356 | #ifdef CONFIG_MACH_SHEPHERD | 355 | #ifdef CONFIG_MACH_SHEPHERD |
357 | MACHINE_START(SHEPHERD, "SHARP Shepherd") | 356 | MACHINE_START(SHEPHERD, "SHARP Shepherd") |
358 | .phys_ram = 0xa0000000, | ||
359 | .phys_io = 0x40000000, | 357 | .phys_io = 0x40000000, |
360 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 358 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
361 | .fixup = fixup_corgi, | 359 | .fixup = fixup_corgi, |
@@ -368,7 +366,6 @@ MACHINE_END | |||
368 | 366 | ||
369 | #ifdef CONFIG_MACH_HUSKY | 367 | #ifdef CONFIG_MACH_HUSKY |
370 | MACHINE_START(HUSKY, "SHARP Husky") | 368 | MACHINE_START(HUSKY, "SHARP Husky") |
371 | .phys_ram = 0xa0000000, | ||
372 | .phys_io = 0x40000000, | 369 | .phys_io = 0x40000000, |
373 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 370 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
374 | .fixup = fixup_corgi, | 371 | .fixup = fixup_corgi, |
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c index 7de159e2ab42..347b9dea24c6 100644 --- a/arch/arm/mach-pxa/idp.c +++ b/arch/arm/mach-pxa/idp.c | |||
@@ -183,7 +183,6 @@ static void __init idp_map_io(void) | |||
183 | 183 | ||
184 | MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") | 184 | MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") |
185 | /* Maintainer: Vibren Technologies */ | 185 | /* Maintainer: Vibren Technologies */ |
186 | .phys_ram = 0xa0000000, | ||
187 | .phys_io = 0x40000000, | 186 | .phys_io = 0x40000000, |
188 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 187 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
189 | .map_io = idp_map_io, | 188 | .map_io = idp_map_io, |
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index b464bc88ff93..3e26d7ce5bb2 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
@@ -437,7 +437,6 @@ static void __init lubbock_map_io(void) | |||
437 | 437 | ||
438 | MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)") | 438 | MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)") |
439 | /* Maintainer: MontaVista Software Inc. */ | 439 | /* Maintainer: MontaVista Software Inc. */ |
440 | .phys_ram = 0xa0000000, | ||
441 | .phys_io = 0x40000000, | 440 | .phys_io = 0x40000000, |
442 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 441 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
443 | .map_io = lubbock_map_io, | 442 | .map_io = lubbock_map_io, |
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 8da9d3efe9a0..d5bda60209ec 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
@@ -489,7 +489,6 @@ static void __init mainstone_map_io(void) | |||
489 | 489 | ||
490 | MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)") | 490 | MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)") |
491 | /* Maintainer: MontaVista Software Inc. */ | 491 | /* Maintainer: MontaVista Software Inc. */ |
492 | .phys_ram = 0xa0000000, | ||
493 | .phys_io = 0x40000000, | 492 | .phys_io = 0x40000000, |
494 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 493 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
495 | .map_io = mainstone_map_io, | 494 | .map_io = mainstone_map_io, |
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 663c95005985..911e6ff5a9bd 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
@@ -311,7 +311,6 @@ static void __init fixup_poodle(struct machine_desc *desc, | |||
311 | } | 311 | } |
312 | 312 | ||
313 | MACHINE_START(POODLE, "SHARP Poodle") | 313 | MACHINE_START(POODLE, "SHARP Poodle") |
314 | .phys_ram = 0xa0000000, | ||
315 | .phys_io = 0x40000000, | 314 | .phys_io = 0x40000000, |
316 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 315 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
317 | .fixup = fixup_poodle, | 316 | .fixup = fixup_poodle, |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index a9eacc06555f..c094d99ebf56 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -497,7 +497,6 @@ static void __init fixup_spitz(struct machine_desc *desc, | |||
497 | 497 | ||
498 | #ifdef CONFIG_MACH_SPITZ | 498 | #ifdef CONFIG_MACH_SPITZ |
499 | MACHINE_START(SPITZ, "SHARP Spitz") | 499 | MACHINE_START(SPITZ, "SHARP Spitz") |
500 | .phys_ram = 0xa0000000, | ||
501 | .phys_io = 0x40000000, | 500 | .phys_io = 0x40000000, |
502 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 501 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
503 | .fixup = fixup_spitz, | 502 | .fixup = fixup_spitz, |
@@ -510,7 +509,6 @@ MACHINE_END | |||
510 | 509 | ||
511 | #ifdef CONFIG_MACH_BORZOI | 510 | #ifdef CONFIG_MACH_BORZOI |
512 | MACHINE_START(BORZOI, "SHARP Borzoi") | 511 | MACHINE_START(BORZOI, "SHARP Borzoi") |
513 | .phys_ram = 0xa0000000, | ||
514 | .phys_io = 0x40000000, | 512 | .phys_io = 0x40000000, |
515 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 513 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
516 | .fixup = fixup_spitz, | 514 | .fixup = fixup_spitz, |
@@ -523,7 +521,6 @@ MACHINE_END | |||
523 | 521 | ||
524 | #ifdef CONFIG_MACH_AKITA | 522 | #ifdef CONFIG_MACH_AKITA |
525 | MACHINE_START(AKITA, "SHARP Akita") | 523 | MACHINE_START(AKITA, "SHARP Akita") |
526 | .phys_ram = 0xa0000000, | ||
527 | .phys_io = 0x40000000, | 524 | .phys_io = 0x40000000, |
528 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 525 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
529 | .fixup = fixup_spitz, | 526 | .fixup = fixup_spitz, |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index e4f92efc616e..d168286ed470 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
@@ -295,7 +295,6 @@ static void __init fixup_tosa(struct machine_desc *desc, | |||
295 | } | 295 | } |
296 | 296 | ||
297 | MACHINE_START(TOSA, "SHARP Tosa") | 297 | MACHINE_START(TOSA, "SHARP Tosa") |
298 | .phys_ram = 0xa0000000, | ||
299 | .phys_io = 0x40000000, | 298 | .phys_io = 0x40000000, |
300 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 299 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
301 | .fixup = fixup_tosa, | 300 | .fixup = fixup_tosa, |