clk:starfive:Update pmu Api
authorxingyu.wu <xingyu.wu@starfivetech.com>
Fri, 1 Jul 2022 06:24:43 +0000 (14:24 +0800)
committerxingyu.wu <xingyu.wu@starfivetech.com>
Fri, 1 Jul 2022 06:24:50 +0000 (14:24 +0800)
Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>
Signed-off-by: Walker Chen <walker.chen@starfivetech.com>
drivers/clk/starfive/clk-starfive-jh7110-isp.c
drivers/clk/starfive/clk-starfive-jh7110-vout.c

index bab16b6..945d048 100755 (executable)
@@ -20,7 +20,7 @@
 #include <linux/reset.h>
 #include <linux/reset-controller.h>
 #include <dt-bindings/clock/starfive-jh7110-isp.h>
-#include <soc/starfive/jh7110_pmu.h>
+#include <linux/pm_runtime.h>
 
 #include "clk-starfive-jh7110.h"
 
@@ -101,7 +101,12 @@ static int __init clk_starfive_jh7110_isp_probe(struct platform_device *pdev)
        if (IS_ERR(priv->isp_base))
                return PTR_ERR(priv->isp_base);
 
-       starfive_power_domain_set(POWER_DOMAIN_ISP, 1);
+       pm_runtime_enable(&pdev->dev);
+       ret = pm_runtime_get_sync(&pdev->dev);
+       if (ret < 0) {
+               dev_err(&pdev->dev, "failed to get pm runtime: %d\n", ret);
+               return ret;
+       }
 
        clk_isp_noc_bus = devm_clk_get(priv->dev,
                        "u0_sft7110_noc_bus_clk_isp_axi");
index 5c46b96..b565ffe 100755 (executable)
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/of_device.h>
-#include <soc/starfive/jh7110_pmu.h>
+#include <linux/pm_runtime.h>
 #include <linux/reset.h>
 
 #include <dt-bindings/clock/starfive-jh7110-vout.h>
@@ -107,7 +107,12 @@ static int __init clk_starfive_jh7110_vout_probe(struct platform_device *pdev)
        if (IS_ERR(priv->vout_base))
                return PTR_ERR(priv->vout_base);
 
-       starfive_power_domain_set(POWER_DOMAIN_VOUT, 1);
+       pm_runtime_enable(&pdev->dev);
+       ret = pm_runtime_get_sync(&pdev->dev);
+       if (ret < 0) {
+               dev_err(&pdev->dev, "failed to get pm runtime: %d\n", ret);
+               return ret;
+       }
 
        clk_vout_src = devm_clk_get(priv->dev, "vout_src");
        if (!IS_ERR(clk_vout_src)){