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

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

ARM: restart: kirkwood: use new restart hook 



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

Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d1b860fb

arch/arm/mach-kirkwood/common.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -534,3 +534,19 @@ static int __init kirkwood_clock_gate(void) 
	return 0;

	return 0;

}

}

late_initcall(kirkwood_clock_gate);

late_initcall(kirkwood_clock_gate);



void kirkwood_restart(char mode, const char *cmd)

{

	/*

	 * Enable soft reset to assert RSTOUTn.

	 */

	writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);



	/*

	 * Assert soft reset.

	 */

	writel(SOFT_RESET, SYSTEM_SOFT_RESET);



	while (1)

		;

}

arch/arm/mach-kirkwood/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,7 @@ void kirkwood_uart1_init(void); 
void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);

void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);

void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, int (*dev_ready)(struct mtd_info *));

void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, int (*dev_ready)(struct mtd_info *));

void kirkwood_audio_init(void);

void kirkwood_audio_init(void);

void kirkwood_restart(char, const char *);





extern int kirkwood_tclk;

extern int kirkwood_tclk;

extern struct sys_timer kirkwood_timer;

extern struct sys_timer kirkwood_timer;

arch/arm/mach-kirkwood/d2net_v2-setup.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -227,4 +227,5 @@ MACHINE_START(D2NET_V2, "LaCie d2 Network v2") 
	.init_early	= kirkwood_init_early,

	.init_early	= kirkwood_init_early,

	.init_irq	= kirkwood_init_irq,

	.init_irq	= kirkwood_init_irq,

	.timer		= &kirkwood_timer,

	.timer		= &kirkwood_timer,

	.restart	= kirkwood_restart,

MACHINE_END
 
MACHINE_END

arch/arm/mach-kirkwood/db88f6281-bp-setup.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -103,4 +103,5 @@ MACHINE_START(DB88F6281_BP, "Marvell DB-88F6281-BP Development Board") 
	.init_early	= kirkwood_init_early,

	.init_early	= kirkwood_init_early,

	.init_irq	= kirkwood_init_irq,

	.init_irq	= kirkwood_init_irq,

	.timer		= &kirkwood_timer,

	.timer		= &kirkwood_timer,

	.restart	= kirkwood_restart,

MACHINE_END
 
MACHINE_END

arch/arm/mach-kirkwood/dockstar-setup.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -108,4 +108,5 @@ MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar") 
	.init_early	= kirkwood_init_early,

	.init_early	= kirkwood_init_early,

	.init_irq	= kirkwood_init_irq,

	.init_irq	= kirkwood_init_irq,

	.timer		= &kirkwood_timer,

	.timer		= &kirkwood_timer,

	.restart	= kirkwood_restart,

MACHINE_END
 
MACHINE_END