On Sun 29 Aug 08:47 PDT 2021, Dmitry Baryshkov wrote:
> On sm8250 dispcc and videocc registers are powered up by the MMCX power
> domain. Use runtime PM calls to make sure that required power domain is
> powered on while we access clock controller's registers.
>
Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
Regards,
Bjorn
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> drivers/clk/qcom/videocc-sm8250.c | 27 +++++++++++++++++++++++++--
> 1 file changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clk/qcom/videocc-sm8250.c b/drivers/clk/qcom/videocc-sm8250.c
> index 7b435a1c2c4b..8617454e4a77 100644
> --- a/drivers/clk/qcom/videocc-sm8250.c
> +++ b/drivers/clk/qcom/videocc-sm8250.c
> @@ -6,6 +6,7 @@
> #include <linux/clk-provider.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> #include <linux/regmap.h>
>
> #include <dt-bindings/clock/qcom,videocc-sm8250.h>
> @@ -364,13 +365,31 @@ static const struct of_device_id video_cc_sm8250_match_table[] = {
> };
> MODULE_DEVICE_TABLE(of, video_cc_sm8250_match_table);
>
> +static void video_cc_sm8250_pm_runtime_disable(void *data)
> +{
> + pm_runtime_disable(data);
> +}
> +
> static int video_cc_sm8250_probe(struct platform_device *pdev)
> {
> struct regmap *regmap;
> + int ret;
> +
> + pm_runtime_enable(&pdev->dev);
> +
> + ret = devm_add_action_or_reset(&pdev->dev, video_cc_sm8250_pm_runtime_disable, &pdev->dev);
> + if (ret)
> + return ret;
> +
> + ret = pm_runtime_resume_and_get(&pdev->dev);
> + if (ret)
> + return ret;
>
> regmap = qcom_cc_map(pdev, &video_cc_sm8250_desc);
> - if (IS_ERR(regmap))
> + if (IS_ERR(regmap)) {
> + pm_runtime_put(&pdev->dev);
> return PTR_ERR(regmap);
> + }
>
> clk_lucid_pll_configure(&video_pll0, regmap, &video_pll0_config);
> clk_lucid_pll_configure(&video_pll1, regmap, &video_pll1_config);
> @@ -379,7 +398,11 @@ static int video_cc_sm8250_probe(struct platform_device *pdev)
> regmap_update_bits(regmap, 0xe58, BIT(0), BIT(0));
> regmap_update_bits(regmap, 0xeec, BIT(0), BIT(0));
>
> - return qcom_cc_really_probe(pdev, &video_cc_sm8250_desc, regmap);
> + ret = qcom_cc_really_probe(pdev, &video_cc_sm8250_desc, regmap);
> +
> + pm_runtime_put(&pdev->dev);
> +
> + return ret;
> }
>
> static struct platform_driver video_cc_sm8250_driver = {
> --
> 2.33.0
>
