UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

base: power - use clk_prepare_enable and clk_prepare_disable 

When PM runtime is enabled in DaVinci and the machine migrates to
common clk framework, the clk_enable() gets called without
clk_prepare(). This patch is to fix this issue so that PM run
time can inter work with common clk framework.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Murali Karicheri 2012-10-23 01:18:40 +02:00 committed by Rafael J. Wysocki
parent 77b67063bb
commit c122f27e1c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/base/power/clock_ops.c
View File

@ -99,7 +99,7 @@ static void __pm_clk_remove(struct pm_clock_entry *ce)
if (ce->status < PCE_STATUS_ERROR) { if (ce->status < PCE_STATUS_ERROR) {
if (ce->status == PCE_STATUS_ENABLED) if (ce->status == PCE_STATUS_ENABLED)
clk_disable(ce->clk); clk_disable_unprepare(ce->clk);
if (ce->status >= PCE_STATUS_ACQUIRED) if (ce->status >= PCE_STATUS_ACQUIRED)
clk_put(ce->clk); clk_put(ce->clk);
@ -396,7 +396,7 @@ static void enable_clock(struct device *dev, const char *con_id)
clk = clk_get(dev, con_id); clk = clk_get(dev, con_id);
if (!IS_ERR(clk)) { if (!IS_ERR(clk)) {
clk_enable(clk); clk_prepare_enable(clk);
clk_put(clk); clk_put(clk);
dev_info(dev, "Runtime PM disabled, clock forced on.\n"); dev_info(dev, "Runtime PM disabled, clock forced on.\n");
} }
@ -413,7 +413,7 @@ static void disable_clock(struct device *dev, const char *con_id)
clk = clk_get(dev, con_id); clk = clk_get(dev, con_id);
if (!IS_ERR(clk)) { if (!IS_ERR(clk)) {
clk_disable(clk); clk_disable_unprepare(clk);
clk_put(clk); clk_put(clk);
dev_info(dev, "Runtime PM disabled, clock forced off.\n"); dev_info(dev, "Runtime PM disabled, clock forced off.\n");
} }