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

Commit 00e9967e authored by Russell King's avatar Russell King
Browse files

ARM: restart: highbank: use new restart hook 



Hook these platforms restart code into the new restart hook rather
than using arch_reset().

Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0d68370b

arch/arm/mach-highbank/core.h

+1 −0
Original line number Diff line number Diff line 
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);

arch/arm/mach-highbank/highbank.c

+1 −0
Original line number Diff line number Diff line
@@ -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

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

+3 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-highbank/system.c

+1 −1
Original line number Diff line number Diff line
@@ -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();