Skip to content

Commit

Permalink
ARM: 7251/1: restart: S5PC100: 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 73aed8b commit 5497d2e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
9 changes: 9 additions & 0 deletions arch/arm/mach-s5pc100/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include <plat/iic-core.h>
#include <plat/onenand-core.h>
#include <plat/regs-serial.h>
#include <plat/watchdog-reset.h>

#include "common.h"

Expand Down Expand Up @@ -221,3 +222,11 @@ void __init s5pc100_init_uarts(struct s3c2410_uartcfg *cfg, int no)
{
s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
}

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

soft_restart(0);
}
2 changes: 2 additions & 0 deletions arch/arm/mach-s5pc100/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ void s5pc100_init_irq(void);
void s5pc100_register_clocks(void);
void s5pc100_setup_clocks(void);

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

#ifdef CONFIG_CPU_S5PC100

extern int s5pc100_init(void);
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-s5pc100/mach-smdkc100.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,4 +254,5 @@ MACHINE_START(SMDKC100, "SMDKC100")
.map_io = smdkc100_map_io,
.init_machine = smdkc100_machine_init,
.timer = &s3c24xx_timer,
.restart = s5pc100_restart,
MACHINE_END

0 comments on commit 5497d2e

Please sign in to comment.