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

ARM: restart: cns3xxx: use new restart hook

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

Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2011-11-05 15:32:23 +00:00
parent 6c00071268
commit 3921470527
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-cns3xxx/cns3420vb.c
View File

@@ -202,4 +202,5 @@ MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board")
.init_irq = cns3xxx_init_irq, .init_irq = cns3xxx_init_irq,
.timer = &cns3xxx_timer, .timer = &cns3xxx_timer,
.init_machine = cns3420_init, .init_machine = cns3420_init,
.restart = cns3xxx_restart,
MACHINE_END MACHINE_END

1
arch/arm/mach-cns3xxx/core.h
View File

@@ -22,5 +22,6 @@ static inline void cns3xxx_l2x0_init(void) {}
void __init cns3xxx_map_io(void); void __init cns3xxx_map_io(void);
void __init cns3xxx_init_irq(void); void __init cns3xxx_init_irq(void);
void cns3xxx_power_off(void); void cns3xxx_power_off(void);
void cns3xxx_restart(char, const char *);
#endif /* __CNS3XXX_CORE_H */ #endif /* __CNS3XXX_CORE_H */

5
arch/arm/mach-cns3xxx/include/mach/system.h
View File

@@ -11,7 +11,6 @@
#ifndef __MACH_SYSTEM_H #ifndef __MACH_SYSTEM_H
#define __MACH_SYSTEM_H #define __MACH_SYSTEM_H
#include <linux/io.h>
#include <asm/proc-fns.h> #include <asm/proc-fns.h>
static inline void arch_idle(void) static inline void arch_idle(void)
@@ -23,6 +22,8 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
void arch_reset(char mode, const char *cmd); static inline void arch_reset(char mode, const char *cmd)
{
}
#endif #endif

4
arch/arm/mach-cns3xxx/pm.c
View File

@@ -11,9 +11,9 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <mach/system.h>
#include <mach/cns3xxx.h> #include <mach/cns3xxx.h>
#include <mach/pm.h> #include <mach/pm.h>
#include "core.h"
void cns3xxx_pwr_clk_en(unsigned int block) void cns3xxx_pwr_clk_en(unsigned int block)
{ {
@@ -89,7 +89,7 @@ void cns3xxx_pwr_soft_rst(unsigned int block)
} }
EXPORT_SYMBOL(cns3xxx_pwr_soft_rst); EXPORT_SYMBOL(cns3xxx_pwr_soft_rst);
void arch_reset(char mode, const char *cmd) void cns3xxx_restart(char mode, const char *cmd)
{ {
/* /*
* To reset, we hit the on-board reset register * To reset, we hit the on-board reset register