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

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

ARM: 7266/1: restart: S3C64XX: 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 b27b0727

arch/arm/mach-s3c64xx/common.c

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <plat/irq-vic-timer.h>

#include <plat/regs-irqtype.h>

#include <plat/regs-serial.h>

#include <plat/watchdog-reset.h>



#include "common.h"
@@ -373,3 +374,12 @@ static int __init s3c64xx_init_irq_eint(void) 
	return 0;

}

arch_initcall(s3c64xx_init_irq_eint);



void s3c64xx_restart(char mode, const char *cmd)

{

	if (mode != 's')

		arch_wdt_reset();



	/* if all else fails, or mode was for soft, jump to 0 */

	soft_restart(0);

}

arch/arm/mach-s3c64xx/common.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ void s3c64xx_init_io(struct map_desc *mach_desc, int size); 
void s3c64xx_register_clocks(unsigned long xtal, unsigned armclk_limit);

void s3c64xx_setup_clocks(void);



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



extern struct syscore_ops s3c64xx_irq_syscore_ops;

extern struct sysdev_class s3c64xx_sysclass;

arch/arm/mach-s3c64xx/include/mach/system.h

+0 −7
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#ifndef __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H __FILE__



#include <plat/watchdog-reset.h>



static void arch_idle(void)

{

	/* nothing here yet */
@@ -20,11 +18,6 @@ static void arch_idle(void) 


static void arch_reset(char mode, const char *cmd)

{

	if (mode != 's')

		arch_wdt_reset();



	/* if all else fails, or mode was for soft, jump to 0 */

	soft_restart(0);

}



#endif /* __ASM_ARCH_IRQ_H */

arch/arm/mach-s3c64xx/mach-anw6410.c

+1 −0
Original line number Diff line number Diff line
@@ -240,4 +240,5 @@ MACHINE_START(ANW6410, "A&W6410") 
	.map_io		= anw6410_map_io,

	.init_machine	= anw6410_machine_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c64xx_restart,

MACHINE_END

arch/arm/mach-s3c64xx/mach-crag6410.c

+1 −0
Original line number Diff line number Diff line
@@ -715,4 +715,5 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") 
	.map_io		= crag6410_map_io,

	.init_machine	= crag6410_machine_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c64xx_restart,

MACHINE_END