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>

diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
index 2899ee8f0806df5794397e484fb0629ef16c857b..a4921bc9f1dcfc4724170ff0ef94c9bb684dd08e 100644 (file)
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@ -35,7 +35,6 @@
 #include <plat/cpu.h>
 #include <plat/clock.h>
 #include <plat/devs.h>
-#include <plat/reset.h>
 #include <plat/sdhci.h>
 #include <plat/adc-core.h>
 #include <plat/ata-core.h>
@@ -151,7 +150,7 @@ static void s5pv210_idle(void)
        local_irq_enable();
 }
 
-static void s5pv210_sw_reset(void)
+void s5pv210_restart(char mode, const char *cmd)
 {
        __raw_writel(0x1, S5P_SWRESET);
 }
@@ -251,9 +250,6 @@ int __init s5pv210_init(void)
        /* set idle function */
        pm_idle = s5pv210_idle;
 
-       /* set sw_reset function */
-       s5p_reset_hook = s5pv210_sw_reset;
-
        return sysdev_register(&s5pv210_sysdev);
 }
 

diff --git a/arch/arm/mach-s5pv210/common.h b/arch/arm/mach-s5pv210/common.h
index f74ef965bba312857fe81488442dfd5f1e885f13..6ed2af5c75189a92cc702886ae88b87788ccf94b 100644 (file)
--- a/arch/arm/mach-s5pv210/common.h
+++ b/arch/arm/mach-s5pv210/common.h
@@ -18,6 +18,8 @@ void s5pv210_init_irq(void);
 void s5pv210_register_clocks(void);
 void s5pv210_setup_clocks(void);
 
+void s5pv210_restart(char mode, const char *cmd);
+
 #ifdef CONFIG_CPU_S5PV210
 
 extern  int s5pv210_init(void);

diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index 261373923c17a11193cbd869b8b29e4617a18a37..edc52968315d31c134206648826a2e228f54e240 100644 (file)
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -684,4 +684,5 @@ MACHINE_START(AQUILA, "Aquila")
        .map_io         = aquila_map_io,
        .init_machine   = aquila_machine_init,
        .timer          = &s5p_timer,
+       .restart        = s5pv210_restart,
 MACHINE_END

diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index b542f055d0c7ef00add6c0ec412cf3b25257d37f..b5a1dc3ed9c1c5f8fdeac65e777d2647fd5392a9 100644 (file)
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -961,4 +961,5 @@ MACHINE_START(GONI, "GONI")
        .init_machine   = goni_machine_init,
        .timer          = &s5p_timer,
        .reserve        = &goni_reserve,
+       .restart        = s5pv210_restart,
 MACHINE_END

diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c
index 7f55d94d89e088dddc9380f408f8353d4d0ececd..553319f70e52ac623ccd45eafc722eaec230598e 100644 (file)
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -142,4 +142,5 @@ MACHINE_START(SMDKC110, "SMDKC110")
        .map_io         = smdkc110_map_io,
        .init_machine   = smdkc110_machine_init,
        .timer          = &s5p_timer,
+       .restart        = s5pv210_restart,
 MACHINE_END

diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 194c3b0626b597fd26a853876d9ab8f344859fb6..9c6de57043124a44a093fbb0de4c05f521f6f7b4 100644 (file)
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -320,4 +320,5 @@ MACHINE_START(SMDKV210, "SMDKV210")
        .map_io         = smdkv210_map_io,
        .init_machine   = smdkv210_machine_init,
        .timer          = &s5p_timer,
+       .restart        = s5pv210_restart,
 MACHINE_END

diff --git a/arch/arm/mach-s5pv210/mach-torbreck.c b/arch/arm/mach-s5pv210/mach-torbreck.c
index 1669fe607d49446301c042e09374c043e1e8a532..db6409a3abdf1692c075a55bf923eeb462244453 100644 (file)
--- a/arch/arm/mach-s5pv210/mach-torbreck.c
+++ b/arch/arm/mach-s5pv210/mach-torbreck.c
@@ -131,4 +131,5 @@ MACHINE_START(TORBRECK, "TORBRECK")
        .map_io         = torbreck_map_io,
        .init_machine   = torbreck_machine_init,
        .timer          = &s5p_timer,
+       .restart        = s5pv210_restart,
 MACHINE_END