AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

watchdog: sp805_wdt: Add clk_{un}prepare support

Browse Source 
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>
This commit is contained in:
Viresh Kumar 2012-03-12 09:52:17 +05:30 committed by Wim Van Sebroeck
parent 4a516539fa
commit d9df0ef1eb
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/watchdog/sp805_wdt.c
View File

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