Skip to content

Commit

Permalink
davinci_wdt: preparation for switch to common clock framework
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Karicheri, Muralidharan authored and Wim Van Sebroeck committed Dec 19, 2012
1 parent 63fbbc1 commit 5235f57
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/watchdog/davinci_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
if (WARN_ON(IS_ERR(wdt_clk)))
return PTR_ERR(wdt_clk);

clk_enable(wdt_clk);
clk_prepare_enable(wdt_clk);

if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
heartbeat = DEFAULT_HEARTBEAT;
Expand Down Expand Up @@ -256,7 +256,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
wdt_mem = NULL;
}

clk_disable(wdt_clk);
clk_disable_unprepare(wdt_clk);
clk_put(wdt_clk);

return 0;
Expand Down

0 comments on commit 5235f57

Please sign in to comment.