* [PATCH] clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones
@ 2020-11-14 17:44 Stephen Boyd
2020-11-14 18:30 ` Randy Dunlap
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stephen Boyd @ 2020-11-14 17:44 UTC (permalink / raw)
To: Michael Turquette, Stephen Boyd
Cc: linux-kernel, linux-clk, linux-arm-msm, Randy Dunlap,
Geert Uytterhoeven, Nathan Chancellor, Stephen Rothwell,
Taniya Das, Rafael J. Wysocki
Let's call pm_runtime_get() here instead of calling the PM clk APIs
directly. This avoids a compilation problem on CONFIG_PM=n where the
pm_clk_runtime_{resume,suspend}() functions don't exist and covers the
intent, i.e. enable the clks for this device so we can program PLL
settings.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Taniya Das <tdas@codeaurora.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Fixes: 15d09e830bbc ("clk: qcom: camcc: Add camera clock controller driver for SC7180")
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
---
drivers/clk/qcom/camcc-sc7180.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/clk/qcom/camcc-sc7180.c b/drivers/clk/qcom/camcc-sc7180.c
index f51bf5b6decc..dbac5651ab85 100644
--- a/drivers/clk/qcom/camcc-sc7180.c
+++ b/drivers/clk/qcom/camcc-sc7180.c
@@ -1669,16 +1669,14 @@ static int cam_cc_sc7180_probe(struct platform_device *pdev)
goto disable_pm_runtime;
}
- ret = pm_clk_runtime_resume(&pdev->dev);
- if (ret < 0) {
- dev_err(&pdev->dev, "pm runtime resume failed\n");
+ ret = pm_runtime_get(&pdev->dev);
+ if (ret)
goto destroy_pm_clk;
- }
regmap = qcom_cc_map(pdev, &cam_cc_sc7180_desc);
if (IS_ERR(regmap)) {
ret = PTR_ERR(regmap);
- pm_clk_runtime_suspend(&pdev->dev);
+ pm_runtime_put(&pdev->dev);
goto destroy_pm_clk;
}
@@ -1688,9 +1686,7 @@ static int cam_cc_sc7180_probe(struct platform_device *pdev)
clk_fabia_pll_configure(&cam_cc_pll3, regmap, &cam_cc_pll3_config);
ret = qcom_cc_really_probe(pdev, &cam_cc_sc7180_desc, regmap);
-
- pm_clk_runtime_suspend(&pdev->dev);
-
+ pm_runtime_put(&pdev->dev);
if (ret < 0) {
dev_err(&pdev->dev, "Failed to register CAM CC clocks\n");
goto destroy_pm_clk;
--
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones
2020-11-14 17:44 [PATCH] clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones Stephen Boyd
@ 2020-11-14 18:30 ` Randy Dunlap
2020-11-22 4:21 ` Bjorn Andersson
2020-12-29 20:15 ` patchwork-bot+linux-arm-msm
2 siblings, 0 replies; 4+ messages in thread
From: Randy Dunlap @ 2020-11-14 18:30 UTC (permalink / raw)
To: Stephen Boyd, Michael Turquette
Cc: linux-kernel, linux-clk, linux-arm-msm, Geert Uytterhoeven,
Nathan Chancellor, Stephen Rothwell, Taniya Das,
Rafael J. Wysocki
On 11/14/20 9:44 AM, Stephen Boyd wrote:
> Let's call pm_runtime_get() here instead of calling the PM clk APIs
> directly. This avoids a compilation problem on CONFIG_PM=n where the
> pm_clk_runtime_{resume,suspend}() functions don't exist and covers the
> intent, i.e. enable the clks for this device so we can program PLL
> settings.
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Nathan Chancellor <natechancellor@gmail.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Taniya Das <tdas@codeaurora.org>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Fixes: 15d09e830bbc ("clk: qcom: camcc: Add camera clock controller driver for SC7180")
> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Thanks.
> ---
> drivers/clk/qcom/camcc-sc7180.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/clk/qcom/camcc-sc7180.c b/drivers/clk/qcom/camcc-sc7180.c
> index f51bf5b6decc..dbac5651ab85 100644
> --- a/drivers/clk/qcom/camcc-sc7180.c
> +++ b/drivers/clk/qcom/camcc-sc7180.c
> @@ -1669,16 +1669,14 @@ static int cam_cc_sc7180_probe(struct platform_device *pdev)
> goto disable_pm_runtime;
> }
>
> - ret = pm_clk_runtime_resume(&pdev->dev);
> - if (ret < 0) {
> - dev_err(&pdev->dev, "pm runtime resume failed\n");
> + ret = pm_runtime_get(&pdev->dev);
> + if (ret)
> goto destroy_pm_clk;
> - }
>
> regmap = qcom_cc_map(pdev, &cam_cc_sc7180_desc);
> if (IS_ERR(regmap)) {
> ret = PTR_ERR(regmap);
> - pm_clk_runtime_suspend(&pdev->dev);
> + pm_runtime_put(&pdev->dev);
> goto destroy_pm_clk;
> }
>
> @@ -1688,9 +1686,7 @@ static int cam_cc_sc7180_probe(struct platform_device *pdev)
> clk_fabia_pll_configure(&cam_cc_pll3, regmap, &cam_cc_pll3_config);
>
> ret = qcom_cc_really_probe(pdev, &cam_cc_sc7180_desc, regmap);
> -
> - pm_clk_runtime_suspend(&pdev->dev);
> -
> + pm_runtime_put(&pdev->dev);
> if (ret < 0) {
> dev_err(&pdev->dev, "Failed to register CAM CC clocks\n");
> goto destroy_pm_clk;
>
--
~Randy
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones
2020-11-14 17:44 [PATCH] clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones Stephen Boyd
2020-11-14 18:30 ` Randy Dunlap
@ 2020-11-22 4:21 ` Bjorn Andersson
2020-12-29 20:15 ` patchwork-bot+linux-arm-msm
2 siblings, 0 replies; 4+ messages in thread
From: Bjorn Andersson @ 2020-11-22 4:21 UTC (permalink / raw)
To: Stephen Boyd
Cc: Michael Turquette, linux-kernel, linux-clk, linux-arm-msm,
Randy Dunlap, Geert Uytterhoeven, Nathan Chancellor,
Stephen Rothwell, Taniya Das, Rafael J. Wysocki
On Sat 14 Nov 11:44 CST 2020, Stephen Boyd wrote:
> Let's call pm_runtime_get() here instead of calling the PM clk APIs
> directly. This avoids a compilation problem on CONFIG_PM=n where the
> pm_clk_runtime_{resume,suspend}() functions don't exist and covers the
> intent, i.e. enable the clks for this device so we can program PLL
> settings.
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Nathan Chancellor <natechancellor@gmail.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Taniya Das <tdas@codeaurora.org>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Fixes: 15d09e830bbc ("clk: qcom: camcc: Add camera clock controller driver for SC7180")
> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> ---
> drivers/clk/qcom/camcc-sc7180.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/clk/qcom/camcc-sc7180.c b/drivers/clk/qcom/camcc-sc7180.c
> index f51bf5b6decc..dbac5651ab85 100644
> --- a/drivers/clk/qcom/camcc-sc7180.c
> +++ b/drivers/clk/qcom/camcc-sc7180.c
> @@ -1669,16 +1669,14 @@ static int cam_cc_sc7180_probe(struct platform_device *pdev)
> goto disable_pm_runtime;
> }
>
> - ret = pm_clk_runtime_resume(&pdev->dev);
> - if (ret < 0) {
> - dev_err(&pdev->dev, "pm runtime resume failed\n");
> + ret = pm_runtime_get(&pdev->dev);
> + if (ret)
> goto destroy_pm_clk;
> - }
>
> regmap = qcom_cc_map(pdev, &cam_cc_sc7180_desc);
> if (IS_ERR(regmap)) {
> ret = PTR_ERR(regmap);
> - pm_clk_runtime_suspend(&pdev->dev);
> + pm_runtime_put(&pdev->dev);
> goto destroy_pm_clk;
> }
>
> @@ -1688,9 +1686,7 @@ static int cam_cc_sc7180_probe(struct platform_device *pdev)
> clk_fabia_pll_configure(&cam_cc_pll3, regmap, &cam_cc_pll3_config);
>
> ret = qcom_cc_really_probe(pdev, &cam_cc_sc7180_desc, regmap);
> -
> - pm_clk_runtime_suspend(&pdev->dev);
> -
> + pm_runtime_put(&pdev->dev);
> if (ret < 0) {
> dev_err(&pdev->dev, "Failed to register CAM CC clocks\n");
> goto destroy_pm_clk;
> --
> https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones
2020-11-14 17:44 [PATCH] clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones Stephen Boyd
2020-11-14 18:30 ` Randy Dunlap
2020-11-22 4:21 ` Bjorn Andersson
@ 2020-12-29 20:15 ` patchwork-bot+linux-arm-msm
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+linux-arm-msm @ 2020-12-29 20:15 UTC (permalink / raw)
To: Stephen Boyd; +Cc: linux-arm-msm
Hello:
This patch was applied to qcom/linux.git (refs/heads/for-next):
On Sat, 14 Nov 2020 09:44:08 -0800 you wrote:
> Let's call pm_runtime_get() here instead of calling the PM clk APIs
> directly. This avoids a compilation problem on CONFIG_PM=n where the
> pm_clk_runtime_{resume,suspend}() functions don't exist and covers the
> intent, i.e. enable the clks for this device so we can program PLL
> settings.
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Nathan Chancellor <natechancellor@gmail.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Taniya Das <tdas@codeaurora.org>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Fixes: 15d09e830bbc ("clk: qcom: camcc: Add camera clock controller driver for SC7180")
> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
>
> [...]
Here is the summary with links:
- clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones
https://git.kernel.org/qcom/c/8d4025943e13
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-29 20:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-14 17:44 [PATCH] clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones Stephen Boyd
2020-11-14 18:30 ` Randy Dunlap
2020-11-22 4:21 ` Bjorn Andersson
2020-12-29 20:15 ` patchwork-bot+linux-arm-msm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).