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

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

ARM: restart: pnx4008: 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 764cbcc2

arch/arm/mach-pnx4008/core.c

+6 −0
Original line number Diff line number Diff line
@@ -260,6 +260,11 @@ void __init pnx4008_map_io(void) 
	iotable_init(pnx4008_io_desc, ARRAY_SIZE(pnx4008_io_desc));

}



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

{

	soft_restart(0);

}



extern struct sys_timer pnx4008_timer;



MACHINE_START(PNX4008, "Philips PNX4008")
@@ -269,4 +274,5 @@ MACHINE_START(PNX4008, "Philips PNX4008") 
	.init_irq 		= pnx4008_init_irq,

	.init_machine 		= pnx4008_init,

	.timer 			= &pnx4008_timer,

	.restart		= pnx4008_restart,

MACHINE_END

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

+0 −5
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 
#ifndef __ASM_ARCH_SYSTEM_H

#define __ASM_ARCH_SYSTEM_H



#include <linux/io.h>

#include <mach/hardware.h>

#include <mach/platform.h>



static void arch_idle(void)

{

	cpu_do_idle();
@@ -32,7 +28,6 @@ static void arch_idle(void) 


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

{

	soft_restart(0);

}



#endif