summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/time.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@deeprootsystems.com>2009-04-29 16:23:59 -0700
committerKevin Hilman <khilman@deeprootsystems.com>2009-05-26 07:18:15 -0700
commitfb6313879caa46831d71a316b97b51d37d100269 (patch)
tree17441fc3ff71bfda33af952f4ff7d4e1f1ea7403 /arch/arm/mach-davinci/time.c
parent0521444d497ee1f8a31314d2ce3c6b9edab25b51 (diff)
downloadop-kernel-dev-fb6313879caa46831d71a316b97b51d37d100269.zip
op-kernel-dev-fb6313879caa46831d71a316b97b51d37d100269.tar.gz
davinci: add platform support for watchdog timer
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/time.c')
-rw-r--r--arch/arm/mach-davinci/time.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index 494e01b..efbbc2a 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -19,6 +19,7 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/device.h>
+#include <linux/platform_device.h>
#include <mach/hardware.h>
#include <asm/system.h>
@@ -349,15 +350,13 @@ struct sys_timer davinci_timer = {
/* reset board using watchdog timer */
-void davinci_watchdog_reset(void) {
+void davinci_watchdog_reset(void)
+{
u32 tgcr, wdtcr;
void __iomem *base = IO_ADDRESS(DAVINCI_WDOG_BASE);
- struct device dev;
struct clk *wd_clk;
- char *name = "watchdog";
- dev_set_name(&dev, name);
- wd_clk = clk_get(&dev, NULL);
+ wd_clk = clk_get(&davinci_wdt_device.dev, NULL);
if (WARN_ON(IS_ERR(wd_clk)))
return;
clk_enable(wd_clk);
OpenPOWER on IntegriCloud