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

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
...@@ -242,3 +242,8 @@ void __init h720x_map_io(void) ...@@ -242,3 +242,8 @@ void __init h720x_map_io(void)
{ {
iotable_init(h720x_io_desc,ARRAY_SIZE(h720x_io_desc)); 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;
}
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
extern unsigned long h720x_gettimeoffset(void); extern unsigned long h720x_gettimeoffset(void);
extern void __init h720x_init_irq(void); extern void __init h720x_init_irq(void);
extern void __init h720x_map_io(void); extern void __init h720x_map_io(void);
extern void h720x_restart(char, const char *);
#ifdef CONFIG_ARCH_H7202 #ifdef CONFIG_ARCH_H7202
extern struct sys_timer h7202_timer; extern struct sys_timer h7202_timer;
......
...@@ -34,4 +34,5 @@ MACHINE_START(H7201, "Hynix GMS30C7201") ...@@ -34,4 +34,5 @@ MACHINE_START(H7201, "Hynix GMS30C7201")
.init_irq = h720x_init_irq, .init_irq = h720x_init_irq,
.timer = &h7201_timer, .timer = &h7201_timer,
.dma_zone_size = SZ_256M, .dma_zone_size = SZ_256M,
.restart = h720x_restart,
MACHINE_END MACHINE_END
...@@ -77,4 +77,5 @@ MACHINE_START(H7202, "Hynix HMS30C7202") ...@@ -77,4 +77,5 @@ MACHINE_START(H7202, "Hynix HMS30C7202")
.timer = &h7202_timer, .timer = &h7202_timer,
.init_machine = init_eval_h7202, .init_machine = init_eval_h7202,
.dma_zone_size = SZ_256M, .dma_zone_size = SZ_256M,
.restart = h720x_restart,
MACHINE_END MACHINE_END
...@@ -24,10 +24,8 @@ static void arch_idle(void) ...@@ -24,10 +24,8 @@ static void arch_idle(void)
nop(); 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 #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment