watchdog: sp805_wdt: Add clk_{un}prepare support
authorViresh Kumar <viresh.kumar@st.com>
Mon, 12 Mar 2012 04:22:17 +0000 (09:52 +0530)
committerWim Van Sebroeck <wim@iguana.be>
Wed, 30 May 2012 05:56:44 +0000 (07:56 +0200)
clk_{un}prepare() routines are required for required on some platforms to run
part of clk enable/disable() routines from contexts that can schedule.

This patch adds support for these routines in sp805 driver.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/sp805_wdt.c

index 18d4bcfd1bfcf6cc46f82f5690cc508a25fb7571..afcd13676542338a4d4f231e0193ad11626f5d1a 100644 (file)
@@ -130,9 +130,16 @@ static int wdt_config(struct watchdog_device *wdd, bool ping)
        int ret;
 
        if (!ping) {
+               ret = clk_prepare(wdt->clk);
+               if (ret) {
+                       dev_err(&wdt->adev->dev, "clock prepare fail");
+                       return ret;
+               }
+
                ret = clk_enable(wdt->clk);
                if (ret) {
                        dev_err(&wdt->adev->dev, "clock enable fail");
+                       clk_unprepare(wdt->clk);
                        return ret;
                }
        }
@@ -184,6 +191,7 @@ static int wdt_disable(struct watchdog_device *wdd)
        spin_unlock(&wdt->lock);
 
        clk_disable(wdt->clk);
+       clk_unprepare(wdt->clk);
 
        return 0;
 }