[WATCHDOG] davinci: use clock framework for timer frequency

Remove use of CLOCK_TICK_RATE in favor of using clock framework
for getting timer frequency.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 83e22e7ea4a2f6d8db664fba16b186b37d8fa7ff..9d7520fa9e9cc171900444d96ed9ac3128960e5a 100644 (file)
--- 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;
 
 static void wdt_service(void)
 {
@@ -86,6 +88,9 @@ static void wdt_enable(void)
 {
        u32 tgcr;
        u32 timer_margin;
+       unsigned long wdt_freq;
+
+       wdt_freq = clk_get_rate(wdt_clk);
 
        spin_lock(&io_lock);
 
@@ -99,9 +104,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 +204,12 @@ 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(IS_ERR(wdt_clk)))
+               return PTR_ERR(wdt_clk);
+
+       clk_enable(wdt_clk);
+
        if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
                heartbeat = DEFAULT_HEARTBEAT;
 
@@ -245,6 +256,10 @@ static int __devexit davinci_wdt_remove(struct platform_device *pdev)
                kfree(wdt_mem);
                wdt_mem = NULL;
        }
+
+       clk_disable(wdt_clk);
+       clk_put(wdt_clk);
+
        return 0;
 }