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

Commit 114c19b7 authored by Russell King's avatar Russell King
Browse files

ARM: restart: ks8695: use new restart hook 



Hook these platforms restart code into the new restart hook rather
than using arch_reset().

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cb15dff4

arch/arm/mach-ks8695/board-acs5k.c

+1 −0
Original line number Diff line number Diff line
@@ -228,4 +228,5 @@ MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board") 
	.init_irq	= ks8695_init_irq,

	.init_machine	= acs5k_init,

	.timer		= &ks8695_timer,

	.restart	= ks8695_restart,

MACHINE_END

arch/arm/mach-ks8695/board-dsm320.c

+1 −0
Original line number Diff line number Diff line
@@ -126,4 +126,5 @@ MACHINE_START(DSM320, "D-Link DSM-320 Wireless Media Player") 
	.init_irq	= ks8695_init_irq,

	.init_machine	= dsm320_init,

	.timer		= &ks8695_timer,

	.restart	= ks8695_restart,

MACHINE_END

arch/arm/mach-ks8695/board-micrel.c

+1 −0
Original line number Diff line number Diff line
@@ -58,4 +58,5 @@ MACHINE_START(KS8695, "KS8695 Centaur Development Board") 
	.init_irq	= ks8695_init_irq,

	.init_machine	= micrel_init,

	.timer		= &ks8695_timer,

	.restart	= ks8695_restart,

MACHINE_END

arch/arm/mach-ks8695/generic.h

+1 −0
Original line number Diff line number Diff line
@@ -12,4 +12,5 @@ 


extern __init void ks8695_map_io(void);

extern __init void ks8695_init_irq(void);

extern void ks8695_restart(char, const char *);

extern struct sys_timer ks8695_timer;

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

+0 −17
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 
#ifndef __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H



#include <linux/io.h>

#include <mach/regs-timer.h>



static void arch_idle(void)

{

	/*
@@ -29,20 +26,6 @@ static void arch_idle(void) 


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

{

	unsigned int reg;



	if (mode == 's')

		soft_restart(0);



	/* disable timer0 */

	reg = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);

	__raw_writel(reg & ~TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);



	/* enable watchdog mode */

	__raw_writel((10 << 8) | T0TC_WATCHDOG, KS8695_TMR_VA + KS8695_T0TC);



	/* re-enable timer0 */

	__raw_writel(reg | TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);

}



#endif