diff options
author | Tomasz Figa <tomasz.figa@gmail.com> | 2013-06-17 10:45:37 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-06-18 14:13:16 -0400 |
commit | 88f597383824c7a67b3120a3584afca85b91e7bb (patch) | |
tree | 2e316832220bab2fff3ce1942c9de8cbf216f571 /arch/arm/mach-s3c24xx/s3c244x.c | |
parent | a4658e57a7a1bc8d6b54c29c051426ea838fd6d7 (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-s3c24xx/s3c244x.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/s3c244x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/s3c244x.c b/arch/arm/mach-s3c24xx/s3c244x.c index 2a35edb67354..d0423e2544c1 100644 --- a/arch/arm/mach-s3c24xx/s3c244x.c +++ b/arch/arm/mach-s3c24xx/s3c244x.c | |||
@@ -133,6 +133,7 @@ void __init s3c244x_init_clocks(int xtal) | |||
133 | s3c24xx_register_baseclocks(xtal); | 133 | s3c24xx_register_baseclocks(xtal); |
134 | s3c244x_setup_clocks(); | 134 | s3c244x_setup_clocks(); |
135 | s3c2410_baseclk_add(); | 135 | s3c2410_baseclk_add(); |
136 | samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG); | ||
136 | } | 137 | } |
137 | 138 | ||
138 | /* Since the S3C2442 and S3C2440 share items, put both subsystems here */ | 139 | /* Since the S3C2442 and S3C2440 share items, put both subsystems here */ |
@@ -202,7 +203,7 @@ void s3c244x_restart(char mode, const char *cmd) | |||
202 | if (mode == 's') | 203 | if (mode == 's') |
203 | soft_restart(0); | 204 | soft_restart(0); |
204 | 205 | ||
205 | arch_wdt_reset(); | 206 | samsung_wdt_reset(); |
206 | 207 | ||
207 | /* we'll take a jump through zero as a poor second */ | 208 | /* we'll take a jump through zero as a poor second */ |
208 | soft_restart(0); | 209 | soft_restart(0); |