Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73aed8b9 authored by Kukjin Kim's avatar Kukjin Kim Committed by Russell King
Browse files

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: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ff84ded2

arch/arm/mach-s5p64x0/common.c

+9 −0
Original line number Diff line number Diff line
@@ -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"
@@ -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);

}

arch/arm/mach-s5p64x0/common.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-s5p64x0/mach-smdk6440.c

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-s5p64x0/mach-smdk6450.c

+1 −0
Original line number Diff line number Diff line
@@ -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