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

Commit 0d68370b authored by Russell King's avatar Russell King
Browse files

ARM: restart: h720x: 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 6fca1e17

arch/arm/mach-h720x/common.c

+5 −0
Original line number Diff line number Diff line
@@ -242,3 +242,8 @@ void __init h720x_map_io(void) 
{

	iotable_init(h720x_io_desc,ARRAY_SIZE(h720x_io_desc));

}



void h720x_restart(char mode, const char *cmd)

{

	CPU_REG (PMU_BASE, PMU_STAT) |= PMU_WARMRESET;

}

arch/arm/mach-h720x/common.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
extern unsigned long h720x_gettimeoffset(void);

extern void __init h720x_init_irq(void);

extern void __init h720x_map_io(void);

extern void h720x_restart(char, const char *);



#ifdef CONFIG_ARCH_H7202

extern struct sys_timer h7202_timer;

arch/arm/mach-h720x/h7201-eval.c

+1 −0
Original line number Diff line number Diff line
@@ -34,4 +34,5 @@ MACHINE_START(H7201, "Hynix GMS30C7201") 
	.init_irq	= h720x_init_irq,

	.timer		= &h7201_timer,

	.dma_zone_size	= SZ_256M,

	.restart	= h720x_restart,

MACHINE_END

arch/arm/mach-h720x/h7202-eval.c

+1 −0
Original line number Diff line number Diff line
@@ -77,4 +77,5 @@ MACHINE_START(H7202, "Hynix HMS30C7202") 
	.timer		= &h7202_timer,

	.init_machine	= init_eval_h7202,

	.dma_zone_size	= SZ_256M,

	.restart	= h720x_restart,

MACHINE_END

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

+1 −3
Original line number Diff line number Diff line
@@ -24,10 +24,8 @@ static void arch_idle(void) 
	nop();

}





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

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

{

	CPU_REG (PMU_BASE, PMU_STAT) |= PMU_WARMRESET;

}



#endif