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

ARM: restart: nomadik: use new restart hook

Browse Source 
Hook the Nomadik NHK platform restart code into the new restart hook.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2011-11-28 10:48:02 +00:00
parent 8fb06b1242
commit 35b47a405d
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-nomadik/board-nhk8815.c
View File

@@ -284,4 +284,5 @@ MACHINE_START(NOMADIK, "NHK8815")
.init_irq = cpu8815_init_irq, .init_irq = cpu8815_init_irq,
.timer = &nomadik_timer, .timer = &nomadik_timer,
.init_machine = nhk8815_platform_init, .init_machine = nhk8815_platform_init,
.restart = cpu8815_restart,
MACHINE_END MACHINE_END

11
arch/arm/mach-nomadik/cpu-8815.c
View File

@@ -21,6 +21,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h>
#include <plat/gpio-nomadik.h> #include <plat/gpio-nomadik.h>
#include <mach/hardware.h> #include <mach/hardware.h>
@@ -165,3 +166,13 @@ void __init cpu8815_init_irq(void)
#endif #endif
return; return;
} }
void cpu8815_restart(char mode, const char *cmd)
{
void __iomem *src_rstsr = io_p2v(NOMADIK_SRC_BASE + 0x18);
/* FIXME: use egpio when implemented */
/* Write anything to Reset status register */
writel(1, src_rstsr);
}

1
arch/arm/mach-nomadik/cpu-8815.h
View File

@@ -1,3 +1,4 @@
extern void cpu8815_map_io(void); extern void cpu8815_map_io(void);
extern void cpu8815_platform_init(void); extern void cpu8815_platform_init(void);
extern void cpu8815_init_irq(void); extern void cpu8815_init_irq(void);
extern void cpu8815_restart(char, const char *);

9
arch/arm/mach-nomadik/include/mach/system.h
View File

@@ -20,9 +20,6 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H
#include <linux/io.h>
#include <mach/hardware.h>
static inline void arch_idle(void) static inline void arch_idle(void)
{ {
/* /*
@@ -34,12 +31,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)
{ {
void __iomem *src_rstsr = io_p2v(NOMADIK_SRC_BASE + 0x18);
/* FIXME: use egpio when implemented */
/* Write anything to Reset status register */
writel(1, src_rstsr);
} }
#endif #endif