v4l2: fixed sys_crg ioremap error!

diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index 8720646..ed35200 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -592,9 +592,8 @@
                                <0x0 0x11800000 0x0 0x10000>,
                                <0x0 0x11840000 0x0 0x10000>,
                                <0x0 0x11858000 0x0 0x10000>,
-                               <0x0 0x17030000 0x0 0x10000>,
-                               <0x0 0x13020000 0x0 0x10000>;
-                       reg-names = "mipi0", "vclk", "vrst", "mipi1", "sctrl", "isp0", "isp1", "tclk", "trst", "iopad", "pmu", "syscrg";
+                               <0x0 0x17030000 0x0 0x10000>;
+                       reg-names = "mipi0", "vclk", "vrst", "mipi1", "sctrl", "isp0", "isp1", "tclk", "trst", "iopad", "pmu";
                        interrupts = <92 87 86>;
                        status = "disabled";
                };

diff --git a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
index e8ae749..6daf4cd 100755 (executable)
--- a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
@@ -56,7 +56,7 @@ static const struct reg_name mem_reg_name[] = {
        {"trst"},
        {"iopad"},
        {"pmu"},
-       {"syscrg"},
+       //{"syscrg"},
 };
 
 int stfcamss_get_mem_res(struct platform_device *pdev, struct stf_vin_dev *vin)
@@ -96,12 +96,12 @@ int stfcamss_get_mem_res(struct platform_device *pdev, struct stf_vin_dev *vin)
                        vin->vin_top_iopad_base = regs;
                else if (!strcmp(name,"pmu"))
                        vin->pmu_test = regs;
-               else if (!strcmp(name,"syscrg")) 
-                       vin->sys_crg = regs;
                else
                        st_err(ST_CAMSS, "Could not match resource name\n");
        }
 
+       vin->sys_crg = ioremap(0x13020000, 10000);
+
        return 0;
 }