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

Commit d9ca5839 authored Nov 05, 2011 by Russell King

ARM: restart: sa1100: use new restart hook



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

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

parent 1f34f0e2

arch/arm/mach-sa1100/assabet.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -455,4 +455,5 @@ MACHINE_START(ASSABET, "Intel-Assabet")
	#ifdef CONFIG_SA1111		#ifdef CONFIG_SA1111
	.dma_zone_size = SZ_1M,		.dma_zone_size = SZ_1M,
	#endif		#endif
			.restart = sa11x0_restart,
	MACHINE_END		MACHINE_END

arch/arm/mach-sa1100/badge4.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -309,4 +309,5 @@ MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
	#ifdef CONFIG_SA1111		#ifdef CONFIG_SA1111
	.dma_zone_size = SZ_1M,		.dma_zone_size = SZ_1M,
	#endif		#endif
			.restart = sa11x0_restart,
	MACHINE_END		MACHINE_END

arch/arm/mach-sa1100/cerf.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -139,4 +139,5 @@ MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
	.init_irq = cerf_init_irq,		.init_irq = cerf_init_irq,
	.timer = &sa1100_timer,		.timer = &sa1100_timer,
	.init_machine = cerf_init,		.init_machine = cerf_init,
			.restart = sa11x0_restart,
	MACHINE_END		MACHINE_END

arch/arm/mach-sa1100/collie.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -387,4 +387,5 @@ MACHINE_START(COLLIE, "Sharp-Collie")
	.init_irq = sa1100_init_irq,		.init_irq = sa1100_init_irq,
	.timer = &sa1100_timer,		.timer = &sa1100_timer,
	.init_machine = collie_init,		.init_machine = collie_init,
			.restart = sa11x0_restart,
	MACHINE_END		MACHINE_END

arch/arm/mach-sa1100/generic.c

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -126,6 +126,17 @@ static void sa1100_power_off(void)
	PMCR = PMCR_SF;		PMCR = PMCR_SF;
	}		}

			void sa11x0_restart(char mode, const char *cmd)
			{
			if (mode == 's') {
			/* Jump into ROM at address 0 */
			soft_restart(0);
			} else {
			/* Use on-chip reset capability */
			RSRR = RSRR_SWR;
			}
			}

	static void sa11x0_register_device(struct platform_device dev, void data)		static void sa11x0_register_device(struct platform_device dev, void data)
	{		{
	int err;		int err;