Re: [PATCH RT 8/6] [ARM, WATCHDOG] davinci: include mach/timex.h in davinci_wdt.c
From: Russell King - ARM Linux <hidden>
Date: 2009-08-10 17:27:01
Also in:
lkml
Possibly related (same subject, not in this thread)
- 2009-08-16 · Re: [PATCH RT 8/6] [ARM, WATCHDOG] davinci: include mach/timex.h in davinci_wdt.c · Wim Van Sebroeck <hidden>
- 2009-08-13 · Re: [PATCH RT 8/6] [ARM, WATCHDOG] davinci: include mach/timex.h in davinci_wdt.c · Kevin Hilman <hidden>
- 2009-08-09 · Re: [PATCH RT 8/6] [ARM, WATCHDOG] davinci: include mach/timex.h in davinci_wdt.c · Russell King - ARM Linux <hidden>
- 2009-08-09 · [PATCH RT 8/6] [ARM, WATCHDOG] davinci: include mach/timex.h in davinci_wdt.c · Uwe Kleine-König <hidden>
On Mon, Aug 10, 2009 at 09:48:07AM -0700, Kevin Hilman wrote:
quoted hunk ↗ jump to hunk
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 83e22e7..5ed89e4 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c@@ -25,6 +25,7 @@ #include <linux/uaccess.h> #include <linux/io.h> #include <linux/device.h> +#include <linux/clk.h> #define MODULE_NAME "DAVINCI-WDT: "@@ -69,6 +70,7 @@ static unsigned long wdt_status; static struct resource *wdt_mem; static void __iomem *wdt_base; +struct clk *wdt_clk;
Why the random spacing?
quoted hunk ↗ jump to hunk
static void wdt_service(void) {@@ -86,6 +88,10 @@ static void wdt_enable(void) { u32 tgcr; u32 timer_margin; + u32 wdt_freq; + + BUG_ON(!wdt_clk);
BUG_ON here is not required (and wrong).
quoted hunk ↗ jump to hunk
+ wdt_freq = clk_get_rate(wdt_clk); spin_lock(&io_lock);@@ -99,9 +105,9 @@ static void wdt_enable(void) iowrite32(0, wdt_base + TIM12); iowrite32(0, wdt_base + TIM34); /* set timeout period */ - timer_margin = (((u64)heartbeat * CLOCK_TICK_RATE) & 0xffffffff); + timer_margin = (((u64)heartbeat * wdt_freq) & 0xffffffff); iowrite32(timer_margin, wdt_base + PRD12); - timer_margin = (((u64)heartbeat * CLOCK_TICK_RATE) >> 32); + timer_margin = (((u64)heartbeat * wdt_freq) >> 32); iowrite32(timer_margin, wdt_base + PRD34); /* enable run continuously */ iowrite32(ENAMODE12_PERIODIC, wdt_base + TCR);@@ -199,6 +205,11 @@ static int __devinit davinci_wdt_probe(struct platform_device *pdev) struct resource *res; struct device *dev = &pdev->dev; + wdt_clk = clk_get(dev, NULL); + if (WARN_ON(!wdt_clk)) + return -ENODEV;
if (WARN_ON(IS_ERR(wdt_clk))) return PTR_ERR(wdt_clk);
quoted hunk ↗ jump to hunk
+ clk_enable(wdt_clk); + if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT) heartbeat = DEFAULT_HEARTBEAT;@@ -245,6 +256,12 @@ static int __devexit davinci_wdt_remove(struct platform_device *pdev) kfree(wdt_mem); wdt_mem = NULL; } + + if (wdt_clk) {
NULL check is not required.
+ clk_disable(wdt_clk); + clk_put(wdt_clk); + } + return 0; } -- 1.6.3.3