Skip to content

Commit

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

Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Jan 5, 2012
1 parent 0d68370 commit 00e9967
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-highbank/core.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
extern void highbank_clocks_init(void);
extern void highbank_restart(char, const char *);
extern void __iomem *scu_base_addr;
#ifdef CONFIG_DEBUG_HIGHBANK_UART
extern void highbank_lluart_map_io(void);
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-highbank/highbank.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,5 @@ DT_MACHINE_START(HIGHBANK, "Highbank")
.timer = &highbank_timer,
.init_machine = highbank_init,
.dt_compat = highbank_match,
.restart = highbank_restart,
MACHINE_END
4 changes: 3 additions & 1 deletion arch/arm/mach-highbank/include/mach/system.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ static inline void arch_idle(void)
cpu_do_idle();
}

extern void arch_reset(char mode, const char *cmd);
static inline void arch_reset(char mode, const char *cmd)
{
}

#endif
2 changes: 1 addition & 1 deletion arch/arm/mach-highbank/system.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "core.h"
#include "sysregs.h"

void arch_reset(char mode, const char *cmd)
void highbank_restart(char mode, const char *cmd)
{
if (mode == 'h')
hignbank_set_pwr_hard_reset();
Expand Down

0 comments on commit 00e9967

Please sign in to comment.