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

Commit 5497d2e1 authored by Kukjin Kim's avatar Kukjin Kim Committed by Russell King
Browse files

ARM: 7251/1: restart: S5PC100: 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 73aed8b9

arch/arm/mach-s5pc100/common.c

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

}

arch/arm/mach-s5pc100/common.h

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

arch/arm/mach-s5pc100/mach-smdkc100.c

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