diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/system.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/asm-arm/arch-s3c2410/system.h b/include/asm-arm/arch-s3c2410/system.h index 63891786dfa0..cb9cd9fb8611 100644 --- a/include/asm-arm/arch-s3c2410/system.h +++ b/include/asm-arm/arch-s3c2410/system.h | |||
| @@ -20,6 +20,9 @@ | |||
| 20 | #include <asm/plat-s3c/regs-watchdog.h> | 20 | #include <asm/plat-s3c/regs-watchdog.h> |
| 21 | #include <asm/arch/regs-clock.h> | 21 | #include <asm/arch/regs-clock.h> |
| 22 | 22 | ||
| 23 | #include <linux/clk.h> | ||
| 24 | #include <linux/err.h> | ||
| 25 | |||
| 23 | void (*s3c24xx_idle)(void); | 26 | void (*s3c24xx_idle)(void); |
| 24 | void (*s3c24xx_reset_hook)(void); | 27 | void (*s3c24xx_reset_hook)(void); |
| 25 | 28 | ||
| @@ -59,6 +62,8 @@ static void arch_idle(void) | |||
| 59 | static void | 62 | static void |
| 60 | arch_reset(char mode) | 63 | arch_reset(char mode) |
| 61 | { | 64 | { |
| 65 | struct clk *wdtclk; | ||
| 66 | |||
| 62 | if (mode == 's') { | 67 | if (mode == 's') { |
| 63 | cpu_reset(0); | 68 | cpu_reset(0); |
| 64 | } | 69 | } |
| @@ -70,6 +75,12 @@ arch_reset(char mode) | |||
| 70 | 75 | ||
| 71 | __raw_writel(0, S3C2410_WTCON); /* disable watchdog, to be safe */ | 76 | __raw_writel(0, S3C2410_WTCON); /* disable watchdog, to be safe */ |
| 72 | 77 | ||
| 78 | wdtclk = clk_get(NULL, "watchdog"); | ||
| 79 | if (!IS_ERR(wdtclk)) { | ||
| 80 | clk_enable(wdtclk); | ||
| 81 | } else | ||
| 82 | printk(KERN_WARNING "%s: warning: cannot get watchdog clock\n", __func__); | ||
| 83 | |||
| 73 | /* put initial values into count and data */ | 84 | /* put initial values into count and data */ |
| 74 | __raw_writel(0x100, S3C2410_WTCNT); | 85 | __raw_writel(0x100, S3C2410_WTCNT); |
| 75 | __raw_writel(0x100, S3C2410_WTDAT); | 86 | __raw_writel(0x100, S3C2410_WTDAT); |
