lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: restart: integrator: use new restart hook

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

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2011-11-03 19:54:37 +00:00
parent 00e9967e0d
commit 6338b66f8a
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-integrator/common.h
View File

@@ -1,2 +1,3 @@
void integrator_init_early(void); void integrator_init_early(void);
void integrator_reserve(void); void integrator_reserve(void);
void integrator_restart(char, const char *);

8
arch/arm/mach-integrator/core.c
View File

@@ -238,3 +238,11 @@ void __init integrator_reserve(void)
{ {
memblock_reserve(PHYS_OFFSET, __pa(swapper_pg_dir) - PHYS_OFFSET); memblock_reserve(PHYS_OFFSET, __pa(swapper_pg_dir) - PHYS_OFFSET);
} }
/*
* To reset, we hit the on-board reset register in the system FPGA
*/
void integrator_restart(char mode, const char *cmd)
{
cm_control(CM_CTRL_RESET, CM_CTRL_RESET);
}

7
arch/arm/mach-integrator/include/mach/system.h
View File

@@ -21,8 +21,6 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H
#include <mach/cm.h>
static inline void arch_idle(void) static inline void arch_idle(void)
{ {
/* /*
@@ -34,11 +32,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd) static inline void arch_reset(char mode, const char *cmd)
{ {
/*
* To reset, we hit the on-board reset register
* in the system FPGA
*/
cm_control(CM_CTRL_RESET, CM_CTRL_RESET);
} }
#endif #endif

1
arch/arm/mach-integrator/integrator_ap.c
View File

@@ -472,4 +472,5 @@ MACHINE_START(INTEGRATOR, "ARM-Integrator")
.init_irq = ap_init_irq, .init_irq = ap_init_irq,
.timer = &ap_timer, .timer = &ap_timer,
.init_machine = ap_init, .init_machine = ap_init,
.restart = integrator_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-integrator/integrator_cp.c
View File

@@ -499,4 +499,5 @@ MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
.init_irq = intcp_init_irq, .init_irq = intcp_init_irq,
.timer = &cp_timer, .timer = &cp_timer,
.init_machine = intcp_init, .init_machine = intcp_init,
.restart = integrator_restart,
MACHINE_END MACHINE_END