hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: 7250/1: restart: S5P64X0: use new restart hook 

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>
This commit is contained in:
Kukjin Kim 2011-12-22 23:34:25 +01:00 committed by Russell King
parent ff84ded265
commit 73aed8b949
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-s5p64x0/common.c
View File

@ -45,6 +45,7 @@
#include <plat/gpio-cfg.h> #include <plat/gpio-cfg.h>
#include <plat/regs-irqtype.h> #include <plat/regs-irqtype.h>
#include <plat/regs-serial.h> #include <plat/regs-serial.h>
#include <plat/watchdog-reset.h>
#include "common.h" #include "common.h"
@ -457,3 +458,11 @@ static int __init s5p64x0_init_irq_eint(void)
return ret; return ret;
} }
arch_initcall(s5p64x0_init_irq_eint); arch_initcall(s5p64x0_init_irq_eint);
void s5p64x0_restart(char mode, const char *cmd)
{
if (mode != 's')
arch_wdt_reset();
soft_restart(0);
}

2
arch/arm/mach-s5p64x0/common.h
View File

@ -22,6 +22,8 @@ void s5p6440_setup_clocks(void);
void s5p6450_register_clocks(void); void s5p6450_register_clocks(void);
void s5p6450_setup_clocks(void); void s5p6450_setup_clocks(void);
void s5p64x0_restart(char mode, const char *cmd);
#ifdef CONFIG_CPU_S5P6440 #ifdef CONFIG_CPU_S5P6440
extern int s5p64x0_init(void); extern int s5p64x0_init(void);

1
arch/arm/mach-s5p64x0/mach-smdk6440.c
View File

@ -246,4 +246,5 @@ MACHINE_START(SMDK6440, "SMDK6440")
.map_io = smdk6440_map_io, .map_io = smdk6440_map_io,
.init_machine = smdk6440_machine_init, .init_machine = smdk6440_machine_init,
.timer = &s5p_timer, .timer = &s5p_timer,
.restart = s5p64x0_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-s5p64x0/mach-smdk6450.c
View File

@ -266,4 +266,5 @@ MACHINE_START(SMDK6450, "SMDK6450")
.map_io = smdk6450_map_io, .map_io = smdk6450_map_io,
.init_machine = smdk6450_machine_init, .init_machine = smdk6450_machine_init,
.timer = &s5p_timer, .timer = &s5p_timer,
.restart = s5p64x0_restart,
MACHINE_END MACHINE_END