diff options
| author | Tomasz Figa <tomasz.figa@gmail.com> | 2013-06-17 16:45:37 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-06-18 20:13:16 +0200 |
| commit | 88f597383824c7a67b3120a3584afca85b91e7bb (patch) | |
| tree | 2e316832220bab2fff3ce1942c9de8cbf216f571 /arch/arm/mach-s3c24xx/s3c2410.c | |
| parent | ARM: SAMSUNG: Add watchdog reset driver (diff) | |
| download | linux-88f597383824c7a67b3120a3584afca85b91e7bb.tar.xz linux-88f597383824c7a67b3120a3584afca85b91e7bb.zip | |
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-s3c24xx/s3c2410.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/s3c2410.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c2410.c b/arch/arm/mach-s3c24xx/s3c2410.c index d850ea5adac2..ff384acc65b2 100644 --- a/arch/arm/mach-s3c24xx/s3c2410.c +++ b/arch/arm/mach-s3c24xx/s3c2410.c @@ -138,6 +138,7 @@ void __init s3c2410_init_clocks(int xtal) s3c2410_baseclk_add(); s3c24xx_register_clock(&s3c2410_armclk); clkdev_add_table(s3c2410_clk_lookup, ARRAY_SIZE(s3c2410_clk_lookup)); + samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG); } struct bus_type s3c2410_subsys = { @@ -201,7 +202,7 @@ void s3c2410_restart(char mode, const char *cmd) soft_restart(0); } - arch_wdt_reset(); + samsung_wdt_reset(); /* we'll take a jump through zero as a poor second */ soft_restart(0); |