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

Commit fe76daea authored by Russell King's avatar Russell King
Browse files

ARM: restart: w90x900: 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 f5733a1e

arch/arm/mach-w90x900/cpu.c

+16 −0
Original line number Diff line number Diff line
@@ -33,9 +33,11 @@ 
#include <mach/regs-serial.h>

#include <mach/regs-clock.h>

#include <mach/regs-ebi.h>

#include <mach/regs-timer.h>



#include "cpu.h"

#include "clock.h"

#include "nuc9xx.h"



/* Initial IO mappings */
@@ -222,3 +224,17 @@ void __init nuc900_init_clocks(void) 
	clkdev_add_table(nuc900_clkregs, ARRAY_SIZE(nuc900_clkregs));

}



#define	WTCR	(TMR_BA + 0x1C)

#define	WTCLK	(1 << 10)

#define	WTE	(1 << 7)

#define	WTRE	(1 << 1)



void nuc9xx_restart(char mode, const char *cmd)

{

	if (mode == 's') {

		/* Jump into ROM at address 0 */

		soft_restart(0);

	} else {

		__raw_writel(WTE | WTRE | WTCLK, WTCR);

	}

}

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

+0 −17
Original line number Diff line number Diff line
@@ -14,28 +14,11 @@ 
 * (at your option) any later version.

 *

 */



#include <linux/io.h>

#include <asm/proc-fns.h>

#include <mach/map.h>

#include <mach/regs-timer.h>



#define	WTCR	(TMR_BA + 0x1C)

#define	WTCLK	(1 << 10)

#define	WTE	(1 << 7)

#define	WTRE	(1 << 1)



static void arch_idle(void)

{

}



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

{

	if (mode == 's') {

		/* Jump into ROM at address 0 */

		soft_restart(0);

	} else {

		__raw_writel(WTE | WTRE | WTCLK, WTCR);

	}

}

arch/arm/mach-w90x900/mach-nuc910evb.c

+1 −0
Original line number Diff line number Diff line
@@ -38,4 +38,5 @@ MACHINE_START(W90P910EVB, "W90P910EVB") 
	.init_irq	= nuc900_init_irq,

	.init_machine	= nuc910evb_init,

	.timer		= &nuc900_timer,

	.restart	= nuc9xx_restart,

MACHINE_END

arch/arm/mach-w90x900/mach-nuc950evb.c

+1 −0
Original line number Diff line number Diff line
@@ -41,4 +41,5 @@ MACHINE_START(W90P950EVB, "W90P950EVB") 
	.init_irq	= nuc900_init_irq,

	.init_machine	= nuc950evb_init,

	.timer		= &nuc900_timer,

	.restart	= nuc9xx_restart,

MACHINE_END

arch/arm/mach-w90x900/mach-nuc960evb.c

+1 −0
Original line number Diff line number Diff line
@@ -38,4 +38,5 @@ MACHINE_START(W90N960EVB, "W90N960EVB") 
	.init_irq	= nuc900_init_irq,

	.init_machine	= nuc960evb_init,

	.timer		= &nuc900_timer,

	.restart	= nuc9xx_restart,

MACHINE_END