leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

davinci_wdt: preparation for switch to common clock framework

Browse Source 
As a first step towards migrating davinci platforms to use common clock
framework, replace all instances of clk_enable() with clk_prepare_enable()
and clk_disable() with clk_disable_unprepare(). Until the platform is
switched to use the CONFIG_HAVE_CLK_PREPARE Kconfig variable, this just
adds a might_sleep() call and would work without any issues.

This will make it easy later to switch to common clk based implementation
of clk driver from DaVinci specific driver.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Karicheri, Muralidharan 2012-08-30 18:29:10 +00:00 committed by Wim Van Sebroeck
parent 63fbbc1696
commit 5235f57a6f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/watchdog/davinci_wdt.c
View File

@ -208,7 +208,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
if (WARN_ON(IS_ERR(wdt_clk))) if (WARN_ON(IS_ERR(wdt_clk)))
return PTR_ERR(wdt_clk); return PTR_ERR(wdt_clk);
clk_enable(wdt_clk); clk_prepare_enable(wdt_clk);
if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT) if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
heartbeat = DEFAULT_HEARTBEAT; heartbeat = DEFAULT_HEARTBEAT;
@ -256,7 +256,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
wdt_mem = NULL; wdt_mem = NULL;
} }
clk_disable(wdt_clk); clk_disable_unprepare(wdt_clk);
clk_put(wdt_clk); clk_put(wdt_clk);
return 0; return 0;