Skip to content

Commit

Permalink
ARM: restart: ebsa110: use new restart hook
Browse files Browse the repository at this point in the history
Hook the EBSA110 platform restart code into the new restart hook rather
than using arch_reset().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Jan 5, 2012
1 parent 6ca6ff9 commit da90826
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
6 changes: 6 additions & 0 deletions arch/arm/mach-ebsa110/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,11 @@ static int __init ebsa110_init(void)

arch_initcall(ebsa110_init);

static void ebsa110_restart(char mode, const char *cmd)
{
soft_restart(0x80000000);
}

MACHINE_START(EBSA110, "EBSA110")
/* Maintainer: Russell King */
.atag_offset = 0x400,
Expand All @@ -287,4 +292,5 @@ MACHINE_START(EBSA110, "EBSA110")
.map_io = ebsa110_map_io,
.init_irq = ebsa110_init_irq,
.timer = &ebsa110_timer,
.restart = ebsa110_restart,
MACHINE_END
4 changes: 3 additions & 1 deletion arch/arm/mach-ebsa110/include/mach/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ static inline void arch_idle(void)
asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc");
}

#define arch_reset(mode, cmd) soft_restart(0x80000000)
static inline void arch_reset(char mode, const char *cmd)
{
}

#endif

0 comments on commit da90826

Please sign in to comment.