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

Commit 271a74fc authored by Russell King's avatar Russell King
Browse files

ARM: restart: pxa: use new restart hook 



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

Acked-by: default avatarRichard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 125c4033

arch/arm/mach-pxa/balloon3.c

+1 −0
Original line number Diff line number Diff line
@@ -829,4 +829,5 @@ MACHINE_START(BALLOON3, "Balloon3") 
	.timer		= &pxa_timer,

	.init_machine	= balloon3_init,

	.atag_offset	= 0x100,

	.restart	= pxa_restart,

MACHINE_END

arch/arm/mach-pxa/capc7117.c

+2 −1
Original line number Diff line number Diff line
@@ -153,5 +153,6 @@ MACHINE_START(CAPC7117, 
	.init_irq = pxa3xx_init_irq,

	.handle_irq = pxa3xx_handle_irq,

	.timer = &pxa_timer,

	.init_machine = capc7117_init

	.init_machine = capc7117_init,

	.restart	= pxa_restart,

MACHINE_END

arch/arm/mach-pxa/cm-x2xx.c

+1 −0
Original line number Diff line number Diff line
@@ -524,4 +524,5 @@ MACHINE_START(ARMCORE, "Compulab CM-X2XX") 
#ifdef CONFIG_PCI

	.dma_zone_size	= SZ_64M,

#endif

	.restart	= pxa_restart,

MACHINE_END

arch/arm/mach-pxa/cm-x300.c

+1 −0
Original line number Diff line number Diff line
@@ -858,4 +858,5 @@ MACHINE_START(CM_X300, "CM-X300 module") 
	.timer		= &pxa_timer,

	.init_machine	= cm_x300_init,

	.fixup		= cm_x300_fixup,

	.restart	= pxa_restart,

MACHINE_END

arch/arm/mach-pxa/colibri-pxa270.c

+2 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ MACHINE_START(COLIBRI, "Toradex Colibri PXA270") 
	.init_irq	= pxa27x_init_irq,

	.handle_irq	= pxa27x_handle_irq,

	.timer		= &pxa_timer,

	.restart	= pxa_restart,

MACHINE_END



MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC")
@@ -322,5 +323,6 @@ MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC") 
	.init_irq	= pxa27x_init_irq,

	.handle_irq	= pxa27x_handle_irq,

	.timer		= &pxa_timer,

	.restart	= pxa_restart,

MACHINE_END