v4l2: modify pmu interface

diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index 7f079961a3966cc0b703f5067e5911d316797321..72246a72deece1db88dcc193d4404e2bd929a5fb 100755 (executable)
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -813,6 +813,7 @@
                                "rst_pixel_clk_if1", "rst_pixel_clk_if2", "rst_pixel_clk_if3",
                                "rst_m31dphy_hw", "rst_m31dphy_b09_always_on",
                                "rst_isp_top_n", "rst_isp_top_axi";
+                       starfive,aon-syscon = <&aon_syscon 0x00>;
                        power-domains = <&pwrc JH7110_PD_ISP>;
                        /* irq nr: vin, isp, isp_csi, isp_scd, isp_csiline */
                        interrupts = <92 87 88 89 90>;

diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c
index 13fa96f3ca71f8e261ff5f8fd64738316c5a03b4..93ee30d6439d2052105ca1a89d949e0d1fe6265b 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_vin_hw_ops.c
@@ -8,7 +8,7 @@
 #include <media/v4l2-fwnode.h>
 #include <media/v4l2-subdev.h>
 #include <linux/clk-provider.h>
-#include <soc/starfive/jh7110_pmu.h>
+#include <linux/pm_runtime.h>
 
 static void vin_intr_clear(void __iomem *sysctrl_base)
 {
@@ -216,8 +216,15 @@ static irqreturn_t stf_vin_isp_irq_csiline_handler(int irq, void *priv)
 static int stf_vin_top_clk_init(struct stf_vin2_dev *vin_dev)
 {
        struct stfcamss *stfcamss = vin_dev->stfcamss;
+       int ret;
 
-       starfive_power_domain_set(POWER_DOMAIN_ISP, 1);
+       pm_runtime_enable(stfcamss->dev);
+       ret = pm_runtime_get_sync(stfcamss->dev);
+       if (ret < 0) {
+               dev_err(stfcamss->dev,
+                       "vin_clk_init: failed to get pm runtime: %d\n", ret);
+               return ret;
+    }
 
        if (!__clk_is_enabled(stfcamss->sys_clk[STFCLK_NOC_BUS_CLK_ISP_AXI].clk))
                clk_prepare_enable(stfcamss->sys_clk[STFCLK_NOC_BUS_CLK_ISP_AXI].clk);
@@ -241,7 +248,8 @@ static int stf_vin_top_clk_deinit(struct stf_vin2_dev *vin_dev)
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_ISP_AXI].clk);
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_ISPCORE_2X].clk);
 
-       starfive_power_domain_set(POWER_DOMAIN_ISP, 0);
+       pm_runtime_put_sync(stfcamss->dev);
+       pm_runtime_disable(stfcamss->dev);
 
        return 0;
 }