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-clps711x | |
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-clps711x')
-rw-r--r-- | arch/arm/mach-clps711x/autcpu12.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/cdb89712.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/ceiva.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/clep7312.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/edb7211-arch.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/fortunet.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/p720t.c | 2 |
7 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c index 5f18eccdc725..4a74b2c959bd 100644 --- a/arch/arm/mach-clps711x/autcpu12.c +++ b/arch/arm/mach-clps711x/autcpu12.c | |||
@@ -64,8 +64,6 @@ void __init autcpu12_map_io(void) | |||
64 | 64 | ||
65 | MACHINE_START(AUTCPU12, "autronix autcpu12") | 65 | MACHINE_START(AUTCPU12, "autronix autcpu12") |
66 | /* Maintainer: Thomas Gleixner */ | 66 | /* Maintainer: Thomas Gleixner */ |
67 | .phys_io = 0x80000000, | ||
68 | .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, | ||
69 | .boot_params = 0xc0020000, | 67 | .boot_params = 0xc0020000, |
70 | .map_io = autcpu12_map_io, | 68 | .map_io = autcpu12_map_io, |
71 | .init_irq = clps711x_init_irq, | 69 | .init_irq = clps711x_init_irq, |
diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c index 71a80b5b8ad6..5a1689d48793 100644 --- a/arch/arm/mach-clps711x/cdb89712.c +++ b/arch/arm/mach-clps711x/cdb89712.c | |||
@@ -55,8 +55,6 @@ static void __init cdb89712_map_io(void) | |||
55 | 55 | ||
56 | MACHINE_START(CDB89712, "Cirrus-CDB89712") | 56 | MACHINE_START(CDB89712, "Cirrus-CDB89712") |
57 | /* Maintainer: Ray Lehtiniemi */ | 57 | /* Maintainer: Ray Lehtiniemi */ |
58 | .phys_io = 0x80000000, | ||
59 | .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, | ||
60 | .boot_params = 0xc0000100, | 58 | .boot_params = 0xc0000100, |
61 | .map_io = cdb89712_map_io, | 59 | .map_io = cdb89712_map_io, |
62 | .init_irq = clps711x_init_irq, | 60 | .init_irq = clps711x_init_irq, |
diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c index 8ada20184978..16481cf3e931 100644 --- a/arch/arm/mach-clps711x/ceiva.c +++ b/arch/arm/mach-clps711x/ceiva.c | |||
@@ -56,8 +56,6 @@ static void __init ceiva_map_io(void) | |||
56 | 56 | ||
57 | MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame") | 57 | MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame") |
58 | /* Maintainer: Rob Scott */ | 58 | /* Maintainer: Rob Scott */ |
59 | .phys_io = 0x80000000, | ||
60 | .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, | ||
61 | .boot_params = 0xc0000100, | 59 | .boot_params = 0xc0000100, |
62 | .map_io = ceiva_map_io, | 60 | .map_io = ceiva_map_io, |
63 | .init_irq = clps711x_init_irq, | 61 | .init_irq = clps711x_init_irq, |
diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c index 3c3bf45039ff..67b5abb4a60a 100644 --- a/arch/arm/mach-clps711x/clep7312.c +++ b/arch/arm/mach-clps711x/clep7312.c | |||
@@ -37,8 +37,6 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags, | |||
37 | 37 | ||
38 | MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") | 38 | MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") |
39 | /* Maintainer: Nobody */ | 39 | /* Maintainer: Nobody */ |
40 | .phys_io = 0x80000000, | ||
41 | .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, | ||
42 | .boot_params = 0xc0000100, | 40 | .boot_params = 0xc0000100, |
43 | .fixup = fixup_clep7312, | 41 | .fixup = fixup_clep7312, |
44 | .map_io = clps711x_map_io, | 42 | .map_io = clps711x_map_io, |
diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c index 4a7a2322979a..98ca5b2e940d 100644 --- a/arch/arm/mach-clps711x/edb7211-arch.c +++ b/arch/arm/mach-clps711x/edb7211-arch.c | |||
@@ -57,8 +57,6 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags, | |||
57 | 57 | ||
58 | MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") | 58 | MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") |
59 | /* Maintainer: Jon McClintock */ | 59 | /* Maintainer: Jon McClintock */ |
60 | .phys_io = 0x80000000, | ||
61 | .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, | ||
62 | .boot_params = 0xc0020100, /* 0xc0000000 - 0xc001ffff can be video RAM */ | 60 | .boot_params = 0xc0020100, /* 0xc0000000 - 0xc001ffff can be video RAM */ |
63 | .fixup = fixup_edb7211, | 61 | .fixup = fixup_edb7211, |
64 | .map_io = edb7211_map_io, | 62 | .map_io = edb7211_map_io, |
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c index a696099aa4f8..b1cb479e71e9 100644 --- a/arch/arm/mach-clps711x/fortunet.c +++ b/arch/arm/mach-clps711x/fortunet.c | |||
@@ -75,8 +75,6 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags, | |||
75 | 75 | ||
76 | MACHINE_START(FORTUNET, "ARM-FortuNet") | 76 | MACHINE_START(FORTUNET, "ARM-FortuNet") |
77 | /* Maintainer: FortuNet Inc. */ | 77 | /* Maintainer: FortuNet Inc. */ |
78 | .phys_io = 0x80000000, | ||
79 | .io_pg_offst = ((0xf0000000) >> 18) & 0xfffc, | ||
80 | .boot_params = 0x00000000, | 78 | .boot_params = 0x00000000, |
81 | .fixup = fortunet_fixup, | 79 | .fixup = fortunet_fixup, |
82 | .map_io = clps711x_map_io, | 80 | .map_io = clps711x_map_io, |
diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c index 0d94a30fd6fc..cefbce0480b9 100644 --- a/arch/arm/mach-clps711x/p720t.c +++ b/arch/arm/mach-clps711x/p720t.c | |||
@@ -89,8 +89,6 @@ static void __init p720t_map_io(void) | |||
89 | 89 | ||
90 | MACHINE_START(P720T, "ARM-Prospector720T") | 90 | MACHINE_START(P720T, "ARM-Prospector720T") |
91 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 91 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
92 | .phys_io = 0x80000000, | ||
93 | .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, | ||
94 | .boot_params = 0xc0000100, | 92 | .boot_params = 0xc0000100, |
95 | .fixup = fixup_p720t, | 93 | .fixup = fixup_p720t, |
96 | .map_io = p720t_map_io, | 94 | .map_io = p720t_map_io, |