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@xxxxxxxxxxxxx>
> Reported-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> Cc: Nathan Chancellor <natechancellor@xxxxxxxxx>
> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Cc: Taniya Das <tdas@xxxxxxxxxxxxxx>
> Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx>
> Fixes: 15d09e830bbc ("clk: qcom: camcc: Add camera clock controller driver for SC7180")
> Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxx>
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> # 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
