Skip to content

Commit

Permalink
watchdog: sp805_wdt: Add clk_{un}prepare support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Viresh Kumar authored and Wim Van Sebroeck committed May 30, 2012
1 parent 4a51653 commit d9df0ef
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/watchdog/sp805_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit d9df0ef

Please sign in to comment.