On Thursday 20 of September 2012 11:39:36 Murali Karicheri wrote:
> 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 <[email protected]>
OK. I'm not seeing people having problems with this patch, so I'll tentatively
queue it up for v3.8.
Thanks,
Rafael
> diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
> index eb78e96..9d8fde7 100644
> --- a/drivers/base/power/clock_ops.c
> +++ b/drivers/base/power/clock_ops.c
> @@ -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);
> @@ -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");
> }
> @@ -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");
> }
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
