lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: restart: clps711x: use new restart hook

Browse Source 
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>
This commit is contained in:
Russell King
2011-11-05 17:41:52 +00:00
parent d1fce9c115
commit 6c00071268
10 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-clps711x/autcpu12.c
View File

@@ -68,5 +68,6 @@ MACHINE_START(AUTCPU12, "autronix autcpu12")
.map_io = autcpu12_map_io, .map_io = autcpu12_map_io,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
.restart = clps711x_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-clps711x/cdb89712.c
View File

@@ -59,4 +59,5 @@ MACHINE_START(CDB89712, "Cirrus-CDB89712")
.map_io = cdb89712_map_io, .map_io = cdb89712_map_io,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
.restart = clps711x_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-clps711x/ceiva.c
View File

@@ -60,4 +60,5 @@ MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")
.map_io = ceiva_map_io, .map_io = ceiva_map_io,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
.restart = clps711x_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-clps711x/clep7312.c
View File

@@ -41,5 +41,6 @@ MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
.map_io = clps711x_map_io, .map_io = clps711x_map_io,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
.restart = clps711x_restart,
MACHINE_END MACHINE_END

5
arch/arm/mach-clps711x/common.c
View File

@@ -220,3 +220,8 @@ struct sys_timer clps711x_timer = {
.init = clps711x_timer_init, .init = clps711x_timer_init,
.offset = clps711x_gettimeoffset, .offset = clps711x_gettimeoffset,
}; };
void clps711x_restart(char mode, const char *cmd)
{
soft_restart(0);
}

1
arch/arm/mach-clps711x/common.h
View File

@@ -9,3 +9,4 @@ struct sys_timer;
extern void clps711x_map_io(void); extern void clps711x_map_io(void);
extern void clps711x_init_irq(void); extern void clps711x_init_irq(void);
extern struct sys_timer clps711x_timer; extern struct sys_timer clps711x_timer;
extern void clps711x_restart(char mode, const char *cmd);

1
arch/arm/mach-clps711x/edb7211-arch.c
View File

@@ -62,4 +62,5 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
.reserve = edb7211_reserve, .reserve = edb7211_reserve,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
.restart = clps711x_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-clps711x/fortunet.c
View File

@@ -78,4 +78,5 @@ MACHINE_START(FORTUNET, "ARM-FortuNet")
.map_io = clps711x_map_io, .map_io = clps711x_map_io,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
.restart = clps711x_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-clps711x/include/mach/system.h
View File

@@ -34,7 +34,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd) static inline void arch_reset(char mode, const char *cmd)
{ {
soft_restart(0);
} }
#endif #endif

1
arch/arm/mach-clps711x/p720t.c
View File

@@ -93,6 +93,7 @@ MACHINE_START(P720T, "ARM-Prospector720T")
.map_io = p720t_map_io, .map_io = p720t_map_io,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
.restart = clps711x_restart,
MACHINE_END MACHINE_END
static int p720t_hw_init(void) static int p720t_hw_init(void)