aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p64x0
diff options
context:
space:
mode:
authorTomasz Figa <tomasz.figa@gmail.com>2013-06-17 10:45:37 -0400
committerKukjin Kim <kgene.kim@samsung.com>2013-06-18 14:13:16 -0400
commit88f597383824c7a67b3120a3584afca85b91e7bb (patch)
tree2e316832220bab2fff3ce1942c9de8cbf216f571 /arch/arm/mach-s5p64x0
parenta4658e57a7a1bc8d6b54c29c051426ea838fd6d7 (diff)
ARM: SAMSUNG: Let platforms use the new watchdog reset driver
This patch moves all platforms using the legacy watchdog reset helper function to the new watchdog reset driver. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Tested-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0')
-rw-r--r--arch/arm/mach-s5p64x0/common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c
index 8ae5800e807f..76d0053bf564 100644
--- a/arch/arm/mach-s5p64x0/common.c
+++ b/arch/arm/mach-s5p64x0/common.c
@@ -173,6 +173,8 @@ void __init s5p64x0_init_io(struct map_desc *mach_desc, int size)
173 s5p_init_cpu(S5P64X0_SYS_ID); 173 s5p_init_cpu(S5P64X0_SYS_ID);
174 174
175 s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids)); 175 s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
176 samsung_wdt_reset_init(S3C_VA_WATCHDOG);
177
176} 178}
177 179
178void __init s5p6440_map_io(void) 180void __init s5p6440_map_io(void)
@@ -440,7 +442,7 @@ arch_initcall(s5p64x0_init_irq_eint);
440void s5p64x0_restart(char mode, const char *cmd) 442void s5p64x0_restart(char mode, const char *cmd)
441{ 443{
442 if (mode != 's') 444 if (mode != 's')
443 arch_wdt_reset(); 445 samsung_wdt_reset();
444 446
445 soft_restart(0); 447 soft_restart(0);
446} 448}