diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-09-15 17:28:07 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-15 17:28:07 +0200 |
commit | c488637cf0e028ed7973614ee708f94b4dc9c16e (patch) | |
tree | f0ef60051548821e02f8dae8d969e1e90d9c30da /arch/arm/plat-samsung/clock.c | |
parent | 72cc205611879525db0374d9831f84f787112b25 (diff) | |
parent | d03c35939d2a447093e60133156217d6512aa9e3 (diff) |
Merge branch 'samsung-fixes-2' of git://github.com/kgene/linux-samsung into HEAD
Diffstat (limited to 'arch/arm/plat-samsung/clock.c')
-rw-r--r-- | arch/arm/plat-samsung/clock.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/clock.c b/arch/arm/plat-samsung/clock.c index 302c42670bd..3b4451979d1 100644 --- a/arch/arm/plat-samsung/clock.c +++ b/arch/arm/plat-samsung/clock.c @@ -64,6 +64,17 @@ static LIST_HEAD(clocks); */ DEFINE_SPINLOCK(clocks_lock); +/* Global watchdog clock used by arch_wtd_reset() callback */ +struct clk *s3c2410_wdtclk; +static int __init s3c_wdt_reset_init(void) +{ + s3c2410_wdtclk = clk_get(NULL, "watchdog"); + if (IS_ERR(s3c2410_wdtclk)) + printk(KERN_WARNING "%s: warning: cannot get watchdog clock\n", __func__); + return 0; +} +arch_initcall(s3c_wdt_reset_init); + /* enable and disable calls for use with the clk struct */ static int clk_null_enable(struct clk *clk, int enable) |