diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-22 17:36:02 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:19 -0500 |
commit | 1f34f0e2fb862b0399b4221a2be8589a4bfb194b (patch) | |
tree | c187dd8f589e4c476e0464ce9d4c3fa28767c21b /arch/arm/mach-s5pv210/common.c | |
parent | 5497d2e1d63bfdd707d4b19651c4127545ccd135 (diff) |
ARM: 7252/1: restart: S5PV210: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
[kgene.kim@samsung.com: according to local header, updated]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s5pv210/common.c')
-rw-r--r-- | arch/arm/mach-s5pv210/common.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c index 2899ee8f0806..a4921bc9f1dc 100644 --- a/arch/arm/mach-s5pv210/common.c +++ b/arch/arm/mach-s5pv210/common.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <plat/cpu.h> | 35 | #include <plat/cpu.h> |
36 | #include <plat/clock.h> | 36 | #include <plat/clock.h> |
37 | #include <plat/devs.h> | 37 | #include <plat/devs.h> |
38 | #include <plat/reset.h> | ||
39 | #include <plat/sdhci.h> | 38 | #include <plat/sdhci.h> |
40 | #include <plat/adc-core.h> | 39 | #include <plat/adc-core.h> |
41 | #include <plat/ata-core.h> | 40 | #include <plat/ata-core.h> |
@@ -151,7 +150,7 @@ static void s5pv210_idle(void) | |||
151 | local_irq_enable(); | 150 | local_irq_enable(); |
152 | } | 151 | } |
153 | 152 | ||
154 | static void s5pv210_sw_reset(void) | 153 | void s5pv210_restart(char mode, const char *cmd) |
155 | { | 154 | { |
156 | __raw_writel(0x1, S5P_SWRESET); | 155 | __raw_writel(0x1, S5P_SWRESET); |
157 | } | 156 | } |
@@ -251,9 +250,6 @@ int __init s5pv210_init(void) | |||
251 | /* set idle function */ | 250 | /* set idle function */ |
252 | pm_idle = s5pv210_idle; | 251 | pm_idle = s5pv210_idle; |
253 | 252 | ||
254 | /* set sw_reset function */ | ||
255 | s5p_reset_hook = s5pv210_sw_reset; | ||
256 | |||
257 | return sysdev_register(&s5pv210_sysdev); | 253 | return sysdev_register(&s5pv210_sysdev); |
258 | } | 254 | } |
259 | 255 | ||