diff options
Diffstat (limited to 'arch/arm/mach-orion5x')
23 files changed, 25 insertions, 29 deletions
diff --git a/arch/arm/mach-orion5x/board-dt.c b/arch/arm/mach-orion5x/board-dt.c index 32e5c211a89b..35a8014529ca 100644 --- a/arch/arm/mach-orion5x/board-dt.c +++ b/arch/arm/mach-orion5x/board-dt.c | |||
@@ -72,7 +72,7 @@ DT_MACHINE_START(ORION5X_DT, "Marvell Orion5x (Flattened Device Tree)") | |||
72 | .map_io = orion5x_map_io, | 72 | .map_io = orion5x_map_io, |
73 | .init_early = orion5x_init_early, | 73 | .init_early = orion5x_init_early, |
74 | .init_irq = orion_dt_init_irq, | 74 | .init_irq = orion_dt_init_irq, |
75 | .timer = &orion5x_timer, | 75 | .init_time = orion5x_timer_init, |
76 | .init_machine = orion5x_dt_init, | 76 | .init_machine = orion5x_dt_init, |
77 | .restart = orion5x_restart, | 77 | .restart = orion5x_restart, |
78 | .dt_compat = orion5x_dt_compat, | 78 | .dt_compat = orion5x_dt_compat, |
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 550f92320afb..d068f1431c40 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
@@ -217,7 +217,7 @@ int __init orion5x_find_tclk(void) | |||
217 | return 166666667; | 217 | return 166666667; |
218 | } | 218 | } |
219 | 219 | ||
220 | static void __init orion5x_timer_init(void) | 220 | void __init orion5x_timer_init(void) |
221 | { | 221 | { |
222 | orion5x_tclk = orion5x_find_tclk(); | 222 | orion5x_tclk = orion5x_find_tclk(); |
223 | 223 | ||
@@ -225,10 +225,6 @@ static void __init orion5x_timer_init(void) | |||
225 | IRQ_ORION5X_BRIDGE, orion5x_tclk); | 225 | IRQ_ORION5X_BRIDGE, orion5x_tclk); |
226 | } | 226 | } |
227 | 227 | ||
228 | struct sys_timer orion5x_timer = { | ||
229 | .init = orion5x_timer_init, | ||
230 | }; | ||
231 | |||
232 | 228 | ||
233 | /***************************************************************************** | 229 | /***************************************************************************** |
234 | * General | 230 | * General |
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h index 7db5cdd9c4b7..e60345760283 100644 --- a/arch/arm/mach-orion5x/common.h +++ b/arch/arm/mach-orion5x/common.h | |||
@@ -15,7 +15,7 @@ void orion5x_init(void); | |||
15 | void orion5x_id(u32 *dev, u32 *rev, char **dev_name); | 15 | void orion5x_id(u32 *dev, u32 *rev, char **dev_name); |
16 | void clk_init(void); | 16 | void clk_init(void); |
17 | extern int orion5x_tclk; | 17 | extern int orion5x_tclk; |
18 | extern struct sys_timer orion5x_timer; | 18 | extern void orion5x_timer_init(void); |
19 | 19 | ||
20 | /* | 20 | /* |
21 | * Enumerations and functions for Orion windows mapping. Used by Orion core | 21 | * Enumerations and functions for Orion windows mapping. Used by Orion core |
diff --git a/arch/arm/mach-orion5x/d2net-setup.c b/arch/arm/mach-orion5x/d2net-setup.c index e3629c063df2..57d0af74874d 100644 --- a/arch/arm/mach-orion5x/d2net-setup.c +++ b/arch/arm/mach-orion5x/d2net-setup.c | |||
@@ -342,7 +342,7 @@ MACHINE_START(D2NET, "LaCie d2 Network") | |||
342 | .map_io = orion5x_map_io, | 342 | .map_io = orion5x_map_io, |
343 | .init_early = orion5x_init_early, | 343 | .init_early = orion5x_init_early, |
344 | .init_irq = orion5x_init_irq, | 344 | .init_irq = orion5x_init_irq, |
345 | .timer = &orion5x_timer, | 345 | .init_time = orion5x_timer_init, |
346 | .fixup = tag_fixup_mem32, | 346 | .fixup = tag_fixup_mem32, |
347 | .restart = orion5x_restart, | 347 | .restart = orion5x_restart, |
348 | MACHINE_END | 348 | MACHINE_END |
@@ -355,7 +355,7 @@ MACHINE_START(BIGDISK, "LaCie Big Disk Network") | |||
355 | .map_io = orion5x_map_io, | 355 | .map_io = orion5x_map_io, |
356 | .init_early = orion5x_init_early, | 356 | .init_early = orion5x_init_early, |
357 | .init_irq = orion5x_init_irq, | 357 | .init_irq = orion5x_init_irq, |
358 | .timer = &orion5x_timer, | 358 | .init_time = orion5x_timer_init, |
359 | .fixup = tag_fixup_mem32, | 359 | .fixup = tag_fixup_mem32, |
360 | .restart = orion5x_restart, | 360 | .restart = orion5x_restart, |
361 | MACHINE_END | 361 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c index 41fe2b1ff47c..76665640087b 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion5x/db88f5281-setup.c | |||
@@ -362,6 +362,6 @@ MACHINE_START(DB88F5281, "Marvell Orion-2 Development Board") | |||
362 | .map_io = orion5x_map_io, | 362 | .map_io = orion5x_map_io, |
363 | .init_early = orion5x_init_early, | 363 | .init_early = orion5x_init_early, |
364 | .init_irq = orion5x_init_irq, | 364 | .init_irq = orion5x_init_irq, |
365 | .timer = &orion5x_timer, | 365 | .init_time = orion5x_timer_init, |
366 | .restart = orion5x_restart, | 366 | .restart = orion5x_restart, |
367 | MACHINE_END | 367 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index e533588880ff..6eb1732757fd 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c | |||
@@ -714,7 +714,7 @@ MACHINE_START(DNS323, "D-Link DNS-323") | |||
714 | .map_io = orion5x_map_io, | 714 | .map_io = orion5x_map_io, |
715 | .init_early = orion5x_init_early, | 715 | .init_early = orion5x_init_early, |
716 | .init_irq = orion5x_init_irq, | 716 | .init_irq = orion5x_init_irq, |
717 | .timer = &orion5x_timer, | 717 | .init_time = orion5x_timer_init, |
718 | .fixup = tag_fixup_mem32, | 718 | .fixup = tag_fixup_mem32, |
719 | .restart = orion5x_restart, | 719 | .restart = orion5x_restart, |
720 | MACHINE_END | 720 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index f1ae10ae5bd4..b98403526218 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c | |||
@@ -383,7 +383,7 @@ MACHINE_START(KUROBOX_PRO, "Buffalo/Revogear Kurobox Pro") | |||
383 | .map_io = orion5x_map_io, | 383 | .map_io = orion5x_map_io, |
384 | .init_early = orion5x_init_early, | 384 | .init_early = orion5x_init_early, |
385 | .init_irq = orion5x_init_irq, | 385 | .init_irq = orion5x_init_irq, |
386 | .timer = &orion5x_timer, | 386 | .init_time = orion5x_timer_init, |
387 | .fixup = tag_fixup_mem32, | 387 | .fixup = tag_fixup_mem32, |
388 | .restart = orion5x_restart, | 388 | .restart = orion5x_restart, |
389 | MACHINE_END | 389 | MACHINE_END |
@@ -397,7 +397,7 @@ MACHINE_START(LINKSTATION_PRO, "Buffalo Linkstation Pro/Live") | |||
397 | .map_io = orion5x_map_io, | 397 | .map_io = orion5x_map_io, |
398 | .init_early = orion5x_init_early, | 398 | .init_early = orion5x_init_early, |
399 | .init_irq = orion5x_init_irq, | 399 | .init_irq = orion5x_init_irq, |
400 | .timer = &orion5x_timer, | 400 | .init_time = orion5x_timer_init, |
401 | .fixup = tag_fixup_mem32, | 401 | .fixup = tag_fixup_mem32, |
402 | .restart = orion5x_restart, | 402 | .restart = orion5x_restart, |
403 | MACHINE_END | 403 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/ls-chl-setup.c b/arch/arm/mach-orion5x/ls-chl-setup.c index 0c9e413b5805..044da5b6a6ae 100644 --- a/arch/arm/mach-orion5x/ls-chl-setup.c +++ b/arch/arm/mach-orion5x/ls-chl-setup.c | |||
@@ -322,7 +322,7 @@ MACHINE_START(LINKSTATION_LSCHL, "Buffalo Linkstation LiveV3 (LS-CHL)") | |||
322 | .map_io = orion5x_map_io, | 322 | .map_io = orion5x_map_io, |
323 | .init_early = orion5x_init_early, | 323 | .init_early = orion5x_init_early, |
324 | .init_irq = orion5x_init_irq, | 324 | .init_irq = orion5x_init_irq, |
325 | .timer = &orion5x_timer, | 325 | .init_time = orion5x_timer_init, |
326 | .fixup = tag_fixup_mem32, | 326 | .fixup = tag_fixup_mem32, |
327 | .restart = orion5x_restart, | 327 | .restart = orion5x_restart, |
328 | MACHINE_END | 328 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion5x/ls_hgl-setup.c index c1b5d8a58037..d49f93423f52 100644 --- a/arch/arm/mach-orion5x/ls_hgl-setup.c +++ b/arch/arm/mach-orion5x/ls_hgl-setup.c | |||
@@ -269,7 +269,7 @@ MACHINE_START(LINKSTATION_LS_HGL, "Buffalo Linkstation LS-HGL") | |||
269 | .map_io = orion5x_map_io, | 269 | .map_io = orion5x_map_io, |
270 | .init_early = orion5x_init_early, | 270 | .init_early = orion5x_init_early, |
271 | .init_irq = orion5x_init_irq, | 271 | .init_irq = orion5x_init_irq, |
272 | .timer = &orion5x_timer, | 272 | .init_time = orion5x_timer_init, |
273 | .fixup = tag_fixup_mem32, | 273 | .fixup = tag_fixup_mem32, |
274 | .restart = orion5x_restart, | 274 | .restart = orion5x_restart, |
275 | MACHINE_END | 275 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c index 949eaa8f12e3..8e3965c6c0fe 100644 --- a/arch/arm/mach-orion5x/lsmini-setup.c +++ b/arch/arm/mach-orion5x/lsmini-setup.c | |||
@@ -271,7 +271,7 @@ MACHINE_START(LINKSTATION_MINI, "Buffalo Linkstation Mini") | |||
271 | .map_io = orion5x_map_io, | 271 | .map_io = orion5x_map_io, |
272 | .init_early = orion5x_init_early, | 272 | .init_early = orion5x_init_early, |
273 | .init_irq = orion5x_init_irq, | 273 | .init_irq = orion5x_init_irq, |
274 | .timer = &orion5x_timer, | 274 | .init_time = orion5x_timer_init, |
275 | .fixup = tag_fixup_mem32, | 275 | .fixup = tag_fixup_mem32, |
276 | .restart = orion5x_restart, | 276 | .restart = orion5x_restart, |
277 | MACHINE_END | 277 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c index 1c16d045333e..0ec94a1f2b16 100644 --- a/arch/arm/mach-orion5x/mss2-setup.c +++ b/arch/arm/mach-orion5x/mss2-setup.c | |||
@@ -265,7 +265,7 @@ MACHINE_START(MSS2, "Maxtor Shared Storage II") | |||
265 | .map_io = orion5x_map_io, | 265 | .map_io = orion5x_map_io, |
266 | .init_early = orion5x_init_early, | 266 | .init_early = orion5x_init_early, |
267 | .init_irq = orion5x_init_irq, | 267 | .init_irq = orion5x_init_irq, |
268 | .timer = &orion5x_timer, | 268 | .init_time = orion5x_timer_init, |
269 | .fixup = tag_fixup_mem32, | 269 | .fixup = tag_fixup_mem32, |
270 | .restart = orion5x_restart, | 270 | .restart = orion5x_restart, |
271 | MACHINE_END | 271 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c index c87fde4deeca..18143f2a9093 100644 --- a/arch/arm/mach-orion5x/mv2120-setup.c +++ b/arch/arm/mach-orion5x/mv2120-setup.c | |||
@@ -233,7 +233,7 @@ MACHINE_START(MV2120, "HP Media Vault mv2120") | |||
233 | .map_io = orion5x_map_io, | 233 | .map_io = orion5x_map_io, |
234 | .init_early = orion5x_init_early, | 234 | .init_early = orion5x_init_early, |
235 | .init_irq = orion5x_init_irq, | 235 | .init_irq = orion5x_init_irq, |
236 | .timer = &orion5x_timer, | 236 | .init_time = orion5x_timer_init, |
237 | .fixup = tag_fixup_mem32, | 237 | .fixup = tag_fixup_mem32, |
238 | .restart = orion5x_restart, | 238 | .restart = orion5x_restart, |
239 | MACHINE_END | 239 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/net2big-setup.c b/arch/arm/mach-orion5x/net2big-setup.c index 3506f16c0bf2..282e503b003e 100644 --- a/arch/arm/mach-orion5x/net2big-setup.c +++ b/arch/arm/mach-orion5x/net2big-setup.c | |||
@@ -425,7 +425,7 @@ MACHINE_START(NET2BIG, "LaCie 2Big Network") | |||
425 | .map_io = orion5x_map_io, | 425 | .map_io = orion5x_map_io, |
426 | .init_early = orion5x_init_early, | 426 | .init_early = orion5x_init_early, |
427 | .init_irq = orion5x_init_irq, | 427 | .init_irq = orion5x_init_irq, |
428 | .timer = &orion5x_timer, | 428 | .init_time = orion5x_timer_init, |
429 | .fixup = tag_fixup_mem32, | 429 | .fixup = tag_fixup_mem32, |
430 | .restart = orion5x_restart, | 430 | .restart = orion5x_restart, |
431 | MACHINE_END | 431 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c index 9b1c95310291..d6e72f672afb 100644 --- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c +++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | |||
@@ -171,7 +171,7 @@ MACHINE_START(RD88F5181L_FXO, "Marvell Orion-VoIP FXO Reference Design") | |||
171 | .map_io = orion5x_map_io, | 171 | .map_io = orion5x_map_io, |
172 | .init_early = orion5x_init_early, | 172 | .init_early = orion5x_init_early, |
173 | .init_irq = orion5x_init_irq, | 173 | .init_irq = orion5x_init_irq, |
174 | .timer = &orion5x_timer, | 174 | .init_time = orion5x_timer_init, |
175 | .fixup = tag_fixup_mem32, | 175 | .fixup = tag_fixup_mem32, |
176 | .restart = orion5x_restart, | 176 | .restart = orion5x_restart, |
177 | MACHINE_END | 177 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c index 51ba2b81a10b..c8b7913310e5 100644 --- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c +++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | |||
@@ -183,7 +183,7 @@ MACHINE_START(RD88F5181L_GE, "Marvell Orion-VoIP GE Reference Design") | |||
183 | .map_io = orion5x_map_io, | 183 | .map_io = orion5x_map_io, |
184 | .init_early = orion5x_init_early, | 184 | .init_early = orion5x_init_early, |
185 | .init_irq = orion5x_init_irq, | 185 | .init_irq = orion5x_init_irq, |
186 | .timer = &orion5x_timer, | 186 | .init_time = orion5x_timer_init, |
187 | .fixup = tag_fixup_mem32, | 187 | .fixup = tag_fixup_mem32, |
188 | .restart = orion5x_restart, | 188 | .restart = orion5x_restart, |
189 | MACHINE_END | 189 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c index 0a56b9444f1b..f9e156725d7c 100644 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c | |||
@@ -281,6 +281,6 @@ MACHINE_START(RD88F5182, "Marvell Orion-NAS Reference Design") | |||
281 | .map_io = orion5x_map_io, | 281 | .map_io = orion5x_map_io, |
282 | .init_early = orion5x_init_early, | 282 | .init_early = orion5x_init_early, |
283 | .init_irq = orion5x_init_irq, | 283 | .init_irq = orion5x_init_irq, |
284 | .timer = &orion5x_timer, | 284 | .init_time = orion5x_timer_init, |
285 | .restart = orion5x_restart, | 285 | .restart = orion5x_restart, |
286 | MACHINE_END | 286 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c index ed50910b08a4..78a1e6ab1b9d 100644 --- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c +++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | |||
@@ -123,7 +123,7 @@ MACHINE_START(RD88F6183AP_GE, "Marvell Orion-1-90 AP GE Reference Design") | |||
123 | .map_io = orion5x_map_io, | 123 | .map_io = orion5x_map_io, |
124 | .init_early = orion5x_init_early, | 124 | .init_early = orion5x_init_early, |
125 | .init_irq = orion5x_init_irq, | 125 | .init_irq = orion5x_init_irq, |
126 | .timer = &orion5x_timer, | 126 | .init_time = orion5x_timer_init, |
127 | .fixup = tag_fixup_mem32, | 127 | .fixup = tag_fixup_mem32, |
128 | .restart = orion5x_restart, | 128 | .restart = orion5x_restart, |
129 | MACHINE_END | 129 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c index 90e571dc4deb..acc0877ec1c9 100644 --- a/arch/arm/mach-orion5x/terastation_pro2-setup.c +++ b/arch/arm/mach-orion5x/terastation_pro2-setup.c | |||
@@ -361,7 +361,7 @@ MACHINE_START(TERASTATION_PRO2, "Buffalo Terastation Pro II/Live") | |||
361 | .map_io = orion5x_map_io, | 361 | .map_io = orion5x_map_io, |
362 | .init_early = orion5x_init_early, | 362 | .init_early = orion5x_init_early, |
363 | .init_irq = orion5x_init_irq, | 363 | .init_irq = orion5x_init_irq, |
364 | .timer = &orion5x_timer, | 364 | .init_time = orion5x_timer_init, |
365 | .fixup = tag_fixup_mem32, | 365 | .fixup = tag_fixup_mem32, |
366 | .restart = orion5x_restart, | 366 | .restart = orion5x_restart, |
367 | MACHINE_END | 367 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index b184f680e0db..9c17f0c2b488 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c | |||
@@ -326,7 +326,7 @@ MACHINE_START(TS209, "QNAP TS-109/TS-209") | |||
326 | .map_io = orion5x_map_io, | 326 | .map_io = orion5x_map_io, |
327 | .init_early = orion5x_init_early, | 327 | .init_early = orion5x_init_early, |
328 | .init_irq = orion5x_init_irq, | 328 | .init_irq = orion5x_init_irq, |
329 | .timer = &orion5x_timer, | 329 | .init_time = orion5x_timer_init, |
330 | .fixup = tag_fixup_mem32, | 330 | .fixup = tag_fixup_mem32, |
331 | .restart = orion5x_restart, | 331 | .restart = orion5x_restart, |
332 | MACHINE_END | 332 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c index a5c2e64c4ece..8cc5ab6c503e 100644 --- a/arch/arm/mach-orion5x/ts409-setup.c +++ b/arch/arm/mach-orion5x/ts409-setup.c | |||
@@ -315,7 +315,7 @@ MACHINE_START(TS409, "QNAP TS-409") | |||
315 | .map_io = orion5x_map_io, | 315 | .map_io = orion5x_map_io, |
316 | .init_early = orion5x_init_early, | 316 | .init_early = orion5x_init_early, |
317 | .init_irq = orion5x_init_irq, | 317 | .init_irq = orion5x_init_irq, |
318 | .timer = &orion5x_timer, | 318 | .init_time = orion5x_timer_init, |
319 | .fixup = tag_fixup_mem32, | 319 | .fixup = tag_fixup_mem32, |
320 | .restart = orion5x_restart, | 320 | .restart = orion5x_restart, |
321 | MACHINE_END | 321 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c index b0727dcd1ef9..e960855d32ac 100644 --- a/arch/arm/mach-orion5x/ts78xx-setup.c +++ b/arch/arm/mach-orion5x/ts78xx-setup.c | |||
@@ -619,6 +619,6 @@ MACHINE_START(TS78XX, "Technologic Systems TS-78xx SBC") | |||
619 | .map_io = ts78xx_map_io, | 619 | .map_io = ts78xx_map_io, |
620 | .init_early = orion5x_init_early, | 620 | .init_early = orion5x_init_early, |
621 | .init_irq = orion5x_init_irq, | 621 | .init_irq = orion5x_init_irq, |
622 | .timer = &orion5x_timer, | 622 | .init_time = orion5x_timer_init, |
623 | .restart = orion5x_restart, | 623 | .restart = orion5x_restart, |
624 | MACHINE_END | 624 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c index 754c12b6abf0..66552ca7e05d 100644 --- a/arch/arm/mach-orion5x/wnr854t-setup.c +++ b/arch/arm/mach-orion5x/wnr854t-setup.c | |||
@@ -176,7 +176,7 @@ MACHINE_START(WNR854T, "Netgear WNR854T") | |||
176 | .map_io = orion5x_map_io, | 176 | .map_io = orion5x_map_io, |
177 | .init_early = orion5x_init_early, | 177 | .init_early = orion5x_init_early, |
178 | .init_irq = orion5x_init_irq, | 178 | .init_irq = orion5x_init_irq, |
179 | .timer = &orion5x_timer, | 179 | .init_time = orion5x_timer_init, |
180 | .fixup = tag_fixup_mem32, | 180 | .fixup = tag_fixup_mem32, |
181 | .restart = orion5x_restart, | 181 | .restart = orion5x_restart, |
182 | MACHINE_END | 182 | MACHINE_END |
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c index 45c21251eb1e..2c5408e2e689 100644 --- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c +++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c | |||
@@ -264,7 +264,7 @@ MACHINE_START(WRT350N_V2, "Linksys WRT350N v2") | |||
264 | .map_io = orion5x_map_io, | 264 | .map_io = orion5x_map_io, |
265 | .init_early = orion5x_init_early, | 265 | .init_early = orion5x_init_early, |
266 | .init_irq = orion5x_init_irq, | 266 | .init_irq = orion5x_init_irq, |
267 | .timer = &orion5x_timer, | 267 | .init_time = orion5x_timer_init, |
268 | .fixup = tag_fixup_mem32, | 268 | .fixup = tag_fixup_mem32, |
269 | .restart = orion5x_restart, | 269 | .restart = orion5x_restart, |
270 | MACHINE_END | 270 | MACHINE_END |