diff options
| author | Karicheri, Muralidharan <m-karicheri2@ti.com> | 2012-08-30 18:29:10 +0000 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2012-12-19 22:24:39 +0100 |
| commit | 5235f57a6f460d5620acfcf236ca29ecca993325 (patch) | |
| tree | 85e977541382730c0affc2e00f3683608dba5f2e | |
| parent | 63fbbc169674496fc2ae501d97c3905232a3bf64 (diff) | |
| download | op-kernel-dev-5235f57a6f460d5620acfcf236ca29ecca993325.zip op-kernel-dev-5235f57a6f460d5620acfcf236ca29ecca993325.tar.gz | |
davinci_wdt: preparation for switch to common clock framework
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>
| -rw-r--r-- | drivers/watchdog/davinci_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 8791879..6000aea 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c @@ -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; @@ -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; |
