Skip to content

Commit

Permalink
base: power - use clk_prepare_enable and clk_prepare_disable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Murali Karicheri authored and Rafael J. Wysocki committed Nov 14, 2012
1 parent 77b6706 commit c122f27
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/base/power/clock_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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_ENABLED)
clk_disable(ce->clk);
clk_disable_unprepare(ce->clk);

if (ce->status >= PCE_STATUS_ACQUIRED)
clk_put(ce->clk);
Expand Down Expand Up @@ -396,7 +396,7 @@ static void enable_clock(struct device *dev, const char *con_id)

clk = clk_get(dev, con_id);
if (!IS_ERR(clk)) {
clk_enable(clk);
clk_prepare_enable(clk);
clk_put(clk);
dev_info(dev, "Runtime PM disabled, clock forced on.\n");
}
Expand All @@ -413,7 +413,7 @@ static void disable_clock(struct device *dev, const char *con_id)

clk = clk_get(dev, con_id);
if (!IS_ERR(clk)) {
clk_disable(clk);
clk_disable_unprepare(clk);
clk_put(clk);
dev_info(dev, "Runtime PM disabled, clock forced off.\n");
}
Expand Down

0 comments on commit c122f27

Please sign in to comment.