Skip to content

Commit

Permalink
ARM: 7250/1: restart: S5P64X0: use new restart hook
Browse files Browse the repository at this point in the history
Hook these platforms restart code into the new restart hook rather
than using arch_reset().

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Kukjin Kim authored and Russell King committed Jan 5, 2012
1 parent ff84ded commit 73aed8b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 0 deletions.
9 changes: 9 additions & 0 deletions arch/arm/mach-s5p64x0/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <plat/gpio-cfg.h>
#include <plat/regs-irqtype.h>
#include <plat/regs-serial.h>
#include <plat/watchdog-reset.h>

#include "common.h"

Expand Down Expand Up @@ -457,3 +458,11 @@ static int __init s5p64x0_init_irq_eint(void)
return ret;
}
arch_initcall(s5p64x0_init_irq_eint);

void s5p64x0_restart(char mode, const char *cmd)
{
if (mode != 's')
arch_wdt_reset();

soft_restart(0);
}
2 changes: 2 additions & 0 deletions arch/arm/mach-s5p64x0/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ void s5p6440_setup_clocks(void);
void s5p6450_register_clocks(void);
void s5p6450_setup_clocks(void);

void s5p64x0_restart(char mode, const char *cmd);

#ifdef CONFIG_CPU_S5P6440

extern int s5p64x0_init(void);
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-s5p64x0/mach-smdk6440.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,4 +246,5 @@ MACHINE_START(SMDK6440, "SMDK6440")
.map_io = smdk6440_map_io,
.init_machine = smdk6440_machine_init,
.timer = &s5p_timer,
.restart = s5p64x0_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-s5p64x0/mach-smdk6450.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,4 +266,5 @@ MACHINE_START(SMDK6450, "SMDK6450")
.map_io = smdk6450_map_io,
.init_machine = smdk6450_machine_init,
.timer = &s5p_timer,
.restart = s5p64x0_restart,
MACHINE_END

0 comments on commit 73aed8b

Please sign in to comment.