Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d9ca5839fd4b0c820c19401b72962a1d099cb99e

Authored by Russell King
1 parent 1f34f0e2fb
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ARM: restart: sa1100: use new restart hook 

Hook these platforms restart code into the new restart hook rather
than using arch_reset().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 16 changed files with 25 additions and 9 deletions Side-by-side Diff

arch/arm/mach-sa1100/assabet.c
Diff comments   View file @ d9ca583
... ... @@ -455,5 +455,6 @@
455 455 #ifdef CONFIG_SA1111
456 456 .dma_zone_size = SZ_1M,
457 457 #endif
  458 + .restart = sa11x0_restart,
458 459 MACHINE_END
arch/arm/mach-sa1100/badge4.c
Diff comments   View file @ d9ca583
... ... @@ -309,5 +309,6 @@
309 309 #ifdef CONFIG_SA1111
310 310 .dma_zone_size = SZ_1M,
311 311 #endif
  312 + .restart = sa11x0_restart,
312 313 MACHINE_END
arch/arm/mach-sa1100/cerf.c
Diff comments   View file @ d9ca583
... ... @@ -139,5 +139,6 @@
139 139 .init_irq = cerf_init_irq,
140 140 .timer = &sa1100_timer,
141 141 .init_machine = cerf_init,
  142 + .restart = sa11x0_restart,
142 143 MACHINE_END
arch/arm/mach-sa1100/collie.c
Diff comments   View file @ d9ca583
... ... @@ -387,5 +387,6 @@
387 387 .init_irq = sa1100_init_irq,
388 388 .timer = &sa1100_timer,
389 389 .init_machine = collie_init,
  390 + .restart = sa11x0_restart,
390 391 MACHINE_END
arch/arm/mach-sa1100/generic.c
Diff comments   View file @ d9ca583
... ... @@ -126,6 +126,17 @@
126 126 PMCR = PMCR_SF;
127 127 }
128 128  
  129 +void sa11x0_restart(char mode, const char *cmd)
  130 +{
  131 + if (mode == 's') {
  132 + /* Jump into ROM at address 0 */
  133 + soft_restart(0);
  134 + } else {
  135 + /* Use on-chip reset capability */
  136 + RSRR = RSRR_SWR;
  137 + }
  138 +}
  139 +
129 140 static void sa11x0_register_device(struct platform_device *dev, void *data)
130 141 {
131 142 int err;
arch/arm/mach-sa1100/generic.h
Diff comments   View file @ d9ca583
... ... @@ -10,6 +10,7 @@
10 10 extern void __init sa1100_map_io(void);
11 11 extern void __init sa1100_init_irq(void);
12 12 extern void __init sa1100_init_gpio(void);
  13 +extern void sa11x0_restart(char, const char *);
13 14  
14 15 #define SET_BANK(__nr,__start,__size) \
15 16 mi->bank[__nr].start = (__start), \
arch/arm/mach-sa1100/h3100.c
Diff comments   View file @ d9ca583
... ... @@ -89,5 +89,6 @@
89 89 .init_irq = sa1100_init_irq,
90 90 .timer = &sa1100_timer,
91 91 .init_machine = h3100_mach_init,
  92 + .restart = sa11x0_restart,
92 93 MACHINE_END
arch/arm/mach-sa1100/h3600.c
Diff comments   View file @ d9ca583
... ... @@ -130,5 +130,6 @@
130 130 .init_irq = sa1100_init_irq,
131 131 .timer = &sa1100_timer,
132 132 .init_machine = h3600_mach_init,
  133 + .restart = sa11x0_restart,
133 134 MACHINE_END
arch/arm/mach-sa1100/hackkit.c
Diff comments   View file @ d9ca583
... ... @@ -200,5 +200,6 @@
200 200 .init_irq = sa1100_init_irq,
201 201 .timer = &sa1100_timer,
202 202 .init_machine = hackkit_init,
  203 + .restart = sa11x0_restart,
203 204 MACHINE_END
arch/arm/mach-sa1100/include/mach/system.h
Diff comments   View file @ d9ca583
... ... @@ -3,8 +3,6 @@
3 3 *
4 4 * Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net>
5 5 */
6   -#include <mach/hardware.h>
7   -
8 6 static inline void arch_idle(void)
9 7 {
10 8 cpu_do_idle();
... ... @@ -12,12 +10,5 @@
12 10  
13 11 static inline void arch_reset(char mode, const char *cmd)
14 12 {
15   - if (mode == 's') {
16   - /* Jump into ROM at address 0 */
17   - soft_restart(0);
18   - } else {
19   - /* Use on-chip reset capability */
20   - RSRR = RSRR_SWR;
21   - }
22 13 }
arch/arm/mach-sa1100/jornada720.c
Diff comments   View file @ d9ca583
... ... @@ -373,5 +373,6 @@
373 373 #ifdef CONFIG_SA1111
374 374 .dma_zone_size = SZ_1M,
375 375 #endif
  376 + .restart = sa11x0_restart,
376 377 MACHINE_END
arch/arm/mach-sa1100/lart.c
Diff comments   View file @ d9ca583
... ... @@ -66,5 +66,6 @@
66 66 .init_irq = sa1100_init_irq,
67 67 .init_machine = lart_init,
68 68 .timer = &sa1100_timer,
  69 + .restart = sa11x0_restart,
69 70 MACHINE_END
arch/arm/mach-sa1100/nanoengine.c
Diff comments   View file @ d9ca583
... ... @@ -116,5 +116,6 @@
116 116 .init_irq = sa1100_init_irq,
117 117 .timer = &sa1100_timer,
118 118 .init_machine = nanoengine_init,
  119 + .restart = sa11x0_restart,
119 120 MACHINE_END
arch/arm/mach-sa1100/pleb.c
Diff comments   View file @ d9ca583
... ... @@ -150,5 +150,6 @@
150 150 .init_irq = sa1100_init_irq,
151 151 .timer = &sa1100_timer,
152 152 .init_machine = pleb_init,
  153 + .restart = sa11x0_restart,
153 154 MACHINE_END
arch/arm/mach-sa1100/shannon.c
Diff comments   View file @ d9ca583
... ... @@ -87,5 +87,6 @@
87 87 .init_irq = sa1100_init_irq,
88 88 .timer = &sa1100_timer,
89 89 .init_machine = shannon_init,
  90 + .restart = sa11x0_restart,
90 91 MACHINE_END
arch/arm/mach-sa1100/simpad.c
Diff comments   View file @ d9ca583
... ... @@ -396,5 +396,6 @@
396 396 .map_io = simpad_map_io,
397 397 .init_irq = sa1100_init_irq,
398 398 .timer = &sa1100_timer,
  399 + .restart = sa11x0_restart,
399 400 MACHINE_END