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

Commit 9854a38e authored Nov 05, 2011 by Russell King

ARM: restart: mmp: use new restart hook



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

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent b23fcd90

arch/arm/mach-mmp/aspenite.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -243,6 +243,7 @@ MACHINE_START(ASPENITE, "PXA168-based Aspenite Development Platform")
	.init_irq = pxa168_init_irq,		.init_irq = pxa168_init_irq,
	.timer = &pxa168_timer,		.timer = &pxa168_timer,
	.init_machine = common_init,		.init_machine = common_init,
			.restart = pxa168_restart,
	MACHINE_END		MACHINE_END

	MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")		MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")
	@@ -251,4 +252,5 @@ MACHINE_START(ZYLONITE2, "PXA168-based Zylonite2 Development Platform")
	.init_irq = pxa168_init_irq,		.init_irq = pxa168_init_irq,
	.timer = &pxa168_timer,		.timer = &pxa168_timer,
	.init_machine = common_init,		.init_machine = common_init,
			.restart = pxa168_restart,
	MACHINE_END		MACHINE_END

arch/arm/mach-mmp/avengers_lite.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,4 +45,5 @@ MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform")
	.init_irq = pxa168_init_irq,		.init_irq = pxa168_init_irq,
	.timer = &pxa168_timer,		.timer = &pxa168_timer,
	.init_machine = avengers_lite_init,		.init_machine = avengers_lite_init,
			.restart = pxa168_restart,
	MACHINE_END		MACHINE_END

arch/arm/mach-mmp/brownstone.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -219,4 +219,5 @@ MACHINE_START(BROWNSTONE, "Brownstone Development Platform")
	.init_irq = mmp2_init_irq,		.init_irq = mmp2_init_irq,
	.timer = &mmp2_timer,		.timer = &mmp2_timer,
	.init_machine = brownstone_init,		.init_machine = brownstone_init,
			.restart = mmp_restart,
	MACHINE_END		MACHINE_END

arch/arm/mach-mmp/common.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,3 +45,8 @@ void __init mmp_map_io(void)
	/* this is early, initialize mmp_chip_id here */		/* this is early, initialize mmp_chip_id here */
	mmp_chip_id = __raw_readl(MMP_CHIPID);		mmp_chip_id = __raw_readl(MMP_CHIPID);
	}		}

			void mmp_restart(char mode, const char *cmd)
			{
			soft_restart(0);
			}

arch/arm/mach-mmp/common.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,3 +6,4 @@ extern void timer_init(int irq);

	extern void __init icu_init_irq(void);		extern void __init icu_init_irq(void);
	extern void __init mmp_map_io(void);		extern void __init mmp_map_io(void);
			extern void mmp_restart(char, const char *);