diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:38:11 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-08-21 17:14:46 -0400 |
commit | e562cf1720b003c0f4ac8ee7b839108928c93b5f (patch) | |
tree | ed207fabb8f024f624addd2fcc97a559ae696e0a | |
parent | 5eb980f3b8e51ac695bf06febd2bc0838fafc2da (diff) |
ARM: mach-ep93xx: convert boot_params to atag_offset
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: Petr Štetiar <ynezz@true.cz>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-ep93xx/adssphere.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/edb93xx.c | 16 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/gesbc9312.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/micro9.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/simone.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/ts72xx.c | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index 61b98ce4b673..0713448206a5 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c | |||
@@ -33,7 +33,7 @@ static void __init adssphere_init_machine(void) | |||
33 | 33 | ||
34 | MACHINE_START(ADSSPHERE, "ADS Sphere board") | 34 | MACHINE_START(ADSSPHERE, "ADS Sphere board") |
35 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 35 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
36 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 36 | .atag_offset = 0x100, |
37 | .map_io = ep93xx_map_io, | 37 | .map_io = ep93xx_map_io, |
38 | .init_irq = ep93xx_init_irq, | 38 | .init_irq = ep93xx_init_irq, |
39 | .timer = &ep93xx_timer, | 39 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c index 9969bb115f60..257175edc575 100644 --- a/arch/arm/mach-ep93xx/edb93xx.c +++ b/arch/arm/mach-ep93xx/edb93xx.c | |||
@@ -240,7 +240,7 @@ static void __init edb93xx_init_machine(void) | |||
240 | #ifdef CONFIG_MACH_EDB9301 | 240 | #ifdef CONFIG_MACH_EDB9301 |
241 | MACHINE_START(EDB9301, "Cirrus Logic EDB9301 Evaluation Board") | 241 | MACHINE_START(EDB9301, "Cirrus Logic EDB9301 Evaluation Board") |
242 | /* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */ | 242 | /* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */ |
243 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 243 | .atag_offset = 0x100, |
244 | .map_io = ep93xx_map_io, | 244 | .map_io = ep93xx_map_io, |
245 | .init_irq = ep93xx_init_irq, | 245 | .init_irq = ep93xx_init_irq, |
246 | .timer = &ep93xx_timer, | 246 | .timer = &ep93xx_timer, |
@@ -251,7 +251,7 @@ MACHINE_END | |||
251 | #ifdef CONFIG_MACH_EDB9302 | 251 | #ifdef CONFIG_MACH_EDB9302 |
252 | MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board") | 252 | MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board") |
253 | /* Maintainer: George Kashperko <george@chas.com.ua> */ | 253 | /* Maintainer: George Kashperko <george@chas.com.ua> */ |
254 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 254 | .atag_offset = 0x100, |
255 | .map_io = ep93xx_map_io, | 255 | .map_io = ep93xx_map_io, |
256 | .init_irq = ep93xx_init_irq, | 256 | .init_irq = ep93xx_init_irq, |
257 | .timer = &ep93xx_timer, | 257 | .timer = &ep93xx_timer, |
@@ -262,7 +262,7 @@ MACHINE_END | |||
262 | #ifdef CONFIG_MACH_EDB9302A | 262 | #ifdef CONFIG_MACH_EDB9302A |
263 | MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board") | 263 | MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board") |
264 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 264 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
265 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, | 265 | .atag_offset = 0x100, |
266 | .map_io = ep93xx_map_io, | 266 | .map_io = ep93xx_map_io, |
267 | .init_irq = ep93xx_init_irq, | 267 | .init_irq = ep93xx_init_irq, |
268 | .timer = &ep93xx_timer, | 268 | .timer = &ep93xx_timer, |
@@ -273,7 +273,7 @@ MACHINE_END | |||
273 | #ifdef CONFIG_MACH_EDB9307 | 273 | #ifdef CONFIG_MACH_EDB9307 |
274 | MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board") | 274 | MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board") |
275 | /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */ | 275 | /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */ |
276 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 276 | .atag_offset = 0x100, |
277 | .map_io = ep93xx_map_io, | 277 | .map_io = ep93xx_map_io, |
278 | .init_irq = ep93xx_init_irq, | 278 | .init_irq = ep93xx_init_irq, |
279 | .timer = &ep93xx_timer, | 279 | .timer = &ep93xx_timer, |
@@ -284,7 +284,7 @@ MACHINE_END | |||
284 | #ifdef CONFIG_MACH_EDB9307A | 284 | #ifdef CONFIG_MACH_EDB9307A |
285 | MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board") | 285 | MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board") |
286 | /* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */ | 286 | /* Maintainer: H Hartley Sweeten <hsweeten@visionengravers.com> */ |
287 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, | 287 | .atag_offset = 0x100, |
288 | .map_io = ep93xx_map_io, | 288 | .map_io = ep93xx_map_io, |
289 | .init_irq = ep93xx_init_irq, | 289 | .init_irq = ep93xx_init_irq, |
290 | .timer = &ep93xx_timer, | 290 | .timer = &ep93xx_timer, |
@@ -295,7 +295,7 @@ MACHINE_END | |||
295 | #ifdef CONFIG_MACH_EDB9312 | 295 | #ifdef CONFIG_MACH_EDB9312 |
296 | MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board") | 296 | MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board") |
297 | /* Maintainer: Toufeeq Hussain <toufeeq_hussain@infosys.com> */ | 297 | /* Maintainer: Toufeeq Hussain <toufeeq_hussain@infosys.com> */ |
298 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 298 | .atag_offset = 0x100, |
299 | .map_io = ep93xx_map_io, | 299 | .map_io = ep93xx_map_io, |
300 | .init_irq = ep93xx_init_irq, | 300 | .init_irq = ep93xx_init_irq, |
301 | .timer = &ep93xx_timer, | 301 | .timer = &ep93xx_timer, |
@@ -306,7 +306,7 @@ MACHINE_END | |||
306 | #ifdef CONFIG_MACH_EDB9315 | 306 | #ifdef CONFIG_MACH_EDB9315 |
307 | MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board") | 307 | MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board") |
308 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 308 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
309 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 309 | .atag_offset = 0x100, |
310 | .map_io = ep93xx_map_io, | 310 | .map_io = ep93xx_map_io, |
311 | .init_irq = ep93xx_init_irq, | 311 | .init_irq = ep93xx_init_irq, |
312 | .timer = &ep93xx_timer, | 312 | .timer = &ep93xx_timer, |
@@ -317,7 +317,7 @@ MACHINE_END | |||
317 | #ifdef CONFIG_MACH_EDB9315A | 317 | #ifdef CONFIG_MACH_EDB9315A |
318 | MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board") | 318 | MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board") |
319 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 319 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
320 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, | 320 | .atag_offset = 0x100, |
321 | .map_io = ep93xx_map_io, | 321 | .map_io = ep93xx_map_io, |
322 | .init_irq = ep93xx_init_irq, | 322 | .init_irq = ep93xx_init_irq, |
323 | .timer = &ep93xx_timer, | 323 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index 9bd3152bff9a..45ee205856f8 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c | |||
@@ -33,7 +33,7 @@ static void __init gesbc9312_init_machine(void) | |||
33 | 33 | ||
34 | MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") | 34 | MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") |
35 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 35 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
36 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 36 | .atag_offset = 0x100, |
37 | .map_io = ep93xx_map_io, | 37 | .map_io = ep93xx_map_io, |
38 | .init_irq = ep93xx_init_irq, | 38 | .init_irq = ep93xx_init_irq, |
39 | .timer = &ep93xx_timer, | 39 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index 7adea6258efe..e72f7368876e 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c | |||
@@ -77,7 +77,7 @@ static void __init micro9_init_machine(void) | |||
77 | #ifdef CONFIG_MACH_MICRO9H | 77 | #ifdef CONFIG_MACH_MICRO9H |
78 | MACHINE_START(MICRO9, "Contec Micro9-High") | 78 | MACHINE_START(MICRO9, "Contec Micro9-High") |
79 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ | 79 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ |
80 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 80 | .atag_offset = 0x100, |
81 | .map_io = ep93xx_map_io, | 81 | .map_io = ep93xx_map_io, |
82 | .init_irq = ep93xx_init_irq, | 82 | .init_irq = ep93xx_init_irq, |
83 | .timer = &ep93xx_timer, | 83 | .timer = &ep93xx_timer, |
@@ -88,7 +88,7 @@ MACHINE_END | |||
88 | #ifdef CONFIG_MACH_MICRO9M | 88 | #ifdef CONFIG_MACH_MICRO9M |
89 | MACHINE_START(MICRO9M, "Contec Micro9-Mid") | 89 | MACHINE_START(MICRO9M, "Contec Micro9-Mid") |
90 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ | 90 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ |
91 | .boot_params = EP93XX_SDCE3_PHYS_BASE_ASYNC + 0x100, | 91 | .atag_offset = 0x100, |
92 | .map_io = ep93xx_map_io, | 92 | .map_io = ep93xx_map_io, |
93 | .init_irq = ep93xx_init_irq, | 93 | .init_irq = ep93xx_init_irq, |
94 | .timer = &ep93xx_timer, | 94 | .timer = &ep93xx_timer, |
@@ -99,7 +99,7 @@ MACHINE_END | |||
99 | #ifdef CONFIG_MACH_MICRO9L | 99 | #ifdef CONFIG_MACH_MICRO9L |
100 | MACHINE_START(MICRO9L, "Contec Micro9-Lite") | 100 | MACHINE_START(MICRO9L, "Contec Micro9-Lite") |
101 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ | 101 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ |
102 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 102 | .atag_offset = 0x100, |
103 | .map_io = ep93xx_map_io, | 103 | .map_io = ep93xx_map_io, |
104 | .init_irq = ep93xx_init_irq, | 104 | .init_irq = ep93xx_init_irq, |
105 | .timer = &ep93xx_timer, | 105 | .timer = &ep93xx_timer, |
@@ -110,7 +110,7 @@ MACHINE_END | |||
110 | #ifdef CONFIG_MACH_MICRO9S | 110 | #ifdef CONFIG_MACH_MICRO9S |
111 | MACHINE_START(MICRO9S, "Contec Micro9-Slim") | 111 | MACHINE_START(MICRO9S, "Contec Micro9-Slim") |
112 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ | 112 | /* Maintainer: Hubert Feurstein <hubert.feurstein@contec.at> */ |
113 | .boot_params = EP93XX_SDCE3_PHYS_BASE_ASYNC + 0x100, | 113 | .atag_offset = 0x100, |
114 | .map_io = ep93xx_map_io, | 114 | .map_io = ep93xx_map_io, |
115 | .init_irq = ep93xx_init_irq, | 115 | .init_irq = ep93xx_init_irq, |
116 | .timer = &ep93xx_timer, | 116 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index 8392e95d7cea..238bc603da86 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c | |||
@@ -65,8 +65,8 @@ static void __init simone_init_machine(void) | |||
65 | } | 65 | } |
66 | 66 | ||
67 | MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") | 67 | MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") |
68 | /* Maintainer: Ryan Mallon */ | 68 | /* Maintainer: Ryan Mallon */ |
69 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, | 69 | .atag_offset = 0x100, |
70 | .map_io = ep93xx_map_io, | 70 | .map_io = ep93xx_map_io, |
71 | .init_irq = ep93xx_init_irq, | 71 | .init_irq = ep93xx_init_irq, |
72 | .timer = &ep93xx_timer, | 72 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index 2e9c614757e4..3bdf3a2e5ad0 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c | |||
@@ -163,7 +163,7 @@ static void __init snappercl15_init_machine(void) | |||
163 | 163 | ||
164 | MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15") | 164 | MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15") |
165 | /* Maintainer: Ryan Mallon */ | 165 | /* Maintainer: Ryan Mallon */ |
166 | .boot_params = EP93XX_SDCE0_PHYS_BASE + 0x100, | 166 | .atag_offset = 0x100, |
167 | .map_io = ep93xx_map_io, | 167 | .map_io = ep93xx_map_io, |
168 | .init_irq = ep93xx_init_irq, | 168 | .init_irq = ep93xx_init_irq, |
169 | .timer = &ep93xx_timer, | 169 | .timer = &ep93xx_timer, |
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index c2d2cf40ead9..1ade3c340507 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
@@ -257,7 +257,7 @@ static void __init ts72xx_init_machine(void) | |||
257 | 257 | ||
258 | MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") | 258 | MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") |
259 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ | 259 | /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ |
260 | .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, | 260 | .atag_offset = 0x100, |
261 | .map_io = ts72xx_map_io, | 261 | .map_io = ts72xx_map_io, |
262 | .init_irq = ep93xx_init_irq, | 262 | .init_irq = ep93xx_init_irq, |
263 | .timer = &ep93xx_timer, | 263 | .timer = &ep93xx_timer, |