v4l2: modify mipi sensor data third time run cause error

modify mipi sensor data third time run cause error

Signed-off-by: changhuang.liang <changhuang.liang@starfivetech.com>

diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
index bbc6d93..e78b499 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
@@ -79,6 +79,13 @@ static int stf_csi_clk_enable(struct stf_csi_dev *csi_dev)
        clk_prepare_enable(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF2].clk);
        clk_prepare_enable(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF3].clk);
 
+       reset_control_deassert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF0].rstc);
+       reset_control_deassert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF1].rstc);
+       reset_control_deassert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF2].rstc);
+       reset_control_deassert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF3].rstc);
+       reset_control_deassert(stfcamss->sys_rst[STFRST_AXIRD].rstc);
+       reset_control_deassert(stfcamss->sys_rst[STFRST_AXIWR].rstc);
+
        return 0;
 }
 
@@ -86,6 +93,13 @@ static int stf_csi_clk_disable(struct stf_csi_dev *csi_dev)
 {
        struct stfcamss *stfcamss = csi_dev->stfcamss;
 
+       reset_control_assert(stfcamss->sys_rst[STFRST_AXIWR].rstc);
+       reset_control_assert(stfcamss->sys_rst[STFRST_AXIRD].rstc);
+       reset_control_assert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF3].rstc);
+       reset_control_assert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF2].rstc);
+       reset_control_assert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF1].rstc);
+       reset_control_assert(stfcamss->sys_rst[STFRST_PIXEL_CLK_IF0].rstc);
+
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF0].clk);
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF1].clk);
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PIXEL_CLK_IF2].clk);

diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_csiphy_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_csiphy_hw_ops.c
index 15ca14b..b903566 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stf_csiphy_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_csiphy_hw_ops.c
@@ -25,11 +25,17 @@ static int stf_csiphy_clk_set(struct stf_csiphy_dev *csiphy_dev, int on)
                clk_set_rate(stfcamss->sys_clk[STFCLK_M31DPHY_TXCLKESC_LAN0].clk,
                        20480000);
 
+               reset_control_deassert(stfcamss->sys_rst[STFRST_M31DPHY_HW].rstc);
+               reset_control_deassert(stfcamss->sys_rst[STFRST_M31DPHY_B09_ALWAYS_ON].rstc);
+
                count++;
        } else {
                if (count == 0)
                        goto exit;
-
+               if (count == 1) {
+                       reset_control_assert(stfcamss->sys_rst[STFRST_M31DPHY_HW].rstc);
+                       reset_control_assert(stfcamss->sys_rst[STFRST_M31DPHY_B09_ALWAYS_ON].rstc);
+               }
                count--;
        }
 exit:

diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c
index 03c9438..415cc72 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_isp_hw_ops.c
@@ -765,6 +765,8 @@ static int stf_isp_clk_enable(struct stf_isp_dev *isp_dev)
        struct stfcamss *stfcamss = isp_dev->stfcamss;
 
        clk_prepare_enable(stfcamss->sys_clk[STFCLK_WRAPPER_CLK_C].clk);
+       reset_control_deassert(stfcamss->sys_rst[STFRST_WRAPPER_C].rstc);
+       reset_control_deassert(stfcamss->sys_rst[STFRST_WRAPPER_P].rstc);
 
        return 0;
 }
@@ -773,6 +775,9 @@ static int stf_isp_clk_disable(struct stf_isp_dev *isp_dev)
 {
        struct stfcamss *stfcamss = isp_dev->stfcamss;
 
+       //reset STFRST_WRAPPER_C would cause error
+       //reset_control_assert(stfcamss->sys_rst[STFRST_WRAPPER_C].rstc);
+       reset_control_assert(stfcamss->sys_rst[STFRST_WRAPPER_P].rstc);
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_WRAPPER_CLK_C].clk);
 
        return 0;

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 cbbc68a..62257a7 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
@@ -233,6 +233,8 @@ static int stf_vin_top_clk_init(struct stf_vin2_dev *vin_dev)
 
        clk_prepare_enable(stfcamss->sys_clk[STFCLK_ISPCORE_2X].clk);
        clk_prepare_enable(stfcamss->sys_clk[STFCLK_ISP_AXI].clk);
+       reset_control_deassert(stfcamss->sys_rst[STFRST_ISP_TOP_N].rstc);
+       reset_control_deassert(stfcamss->sys_rst[STFRST_ISP_TOP_AXI].rstc);
 
        return 0;
 }
@@ -241,6 +243,8 @@ static int stf_vin_top_clk_deinit(struct stf_vin2_dev *vin_dev)
 {
        struct stfcamss *stfcamss = vin_dev->stfcamss;
 
+       reset_control_assert(stfcamss->sys_rst[STFRST_ISP_TOP_AXI].rstc);
+       reset_control_assert(stfcamss->sys_rst[STFRST_ISP_TOP_N].rstc);
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_ISP_AXI].clk);
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_ISPCORE_2X].clk);
 
@@ -253,32 +257,28 @@ static int stf_vin_top_clk_deinit(struct stf_vin2_dev *vin_dev)
 static int stf_vin_clk_enable(struct stf_vin2_dev *vin_dev)
 {
        struct stfcamss *stfcamss = vin_dev->stfcamss;
-       int ret;
 
        clk_prepare_enable(stfcamss->sys_clk[STFCLK_PCLK].clk);
        clk_set_rate(stfcamss->sys_clk[STFCLK_APB_FUNC].clk, 51200000);
        clk_set_rate(stfcamss->sys_clk[STFCLK_SYS_CLK].clk, 307200000);
 
-       ret = reset_control_deassert(stfcamss->resets);
-       if (ret)
-               dev_err(stfcamss->dev, "deassert stfcamss error.\n");
+       reset_control_deassert(stfcamss->sys_rst[STFRST_PCLK].rstc);
+       reset_control_deassert(stfcamss->sys_rst[STFRST_SYS_CLK].rstc);
 
-       return ret;
+       return 0;
 }
 
 
 static int stf_vin_clk_disable(struct stf_vin2_dev *vin_dev)
 {
        struct stfcamss *stfcamss = vin_dev->stfcamss;
-       int ret;
 
-       ret = reset_control_assert(stfcamss->resets);
-       if (ret)
-               dev_err(stfcamss->dev, "assert stfcamss error.\n");
+       reset_control_assert(stfcamss->sys_rst[STFRST_PCLK].rstc);
+       reset_control_assert(stfcamss->sys_rst[STFRST_SYS_CLK].rstc);
 
        clk_disable_unprepare(stfcamss->sys_clk[STFCLK_PCLK].clk);
 
-       return ret;
+       return 0;
 }
 
 static int stf_vin_config_set(struct stf_vin2_dev *vin_dev)
@@ -288,11 +288,14 @@ static int stf_vin_config_set(struct stf_vin2_dev *vin_dev)
 
 static int stf_vin_wr_stream_set(struct stf_vin2_dev *vin_dev, int on)
 {
+       struct stfcamss *stfcamss = vin_dev->stfcamss;
        struct stf_vin_dev *vin = vin_dev->stfcamss->vin;
 
        //make the axiwr alway on
-       if (on)
+       if (on) {
+               reset_control_deassert(stfcamss->sys_rst[STFRST_AXIWR].rstc);
                reg_set(vin->sysctrl_base, SYSCONSAIF_SYSCFG_20, U0_VIN_CNFG_AXIWR0_EN);
+       }
 
        return 0;
 }

diff --git a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
index 30aeb62..66a40d2 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c
@@ -74,6 +74,23 @@ static struct clk_bulk_data stfcamss_clocks[] = {
        { .id = "clk_noc_bus_clk_isp_axi" },
 };
 
+static struct reset_control_bulk_data stfcamss_resets[] = {
+       { .id = "rst_wrapper_p" },
+       { .id = "rst_wrapper_c" },
+       { .id = "rst_pclk" },
+       { .id = "rst_sys_clk" },
+       { .id = "rst_axird" },
+       { .id = "rst_axiwr" },
+       { .id = "rst_pixel_clk_if0" },
+       { .id = "rst_pixel_clk_if1" },
+       { .id = "rst_pixel_clk_if2" },
+       { .id = "rst_pixel_clk_if3" },
+       { .id = "rst_m31dphy_hw" },
+       { .id = "rst_m31dphy_b09_always_on" },
+       { .id = "rst_isp_top_n" },
+       { .id = "rst_isp_top_axi" },
+};
+
 int stfcamss_get_mem_res(struct platform_device *pdev, struct stf_vin_dev *vin)
 {
        struct device *dev = &pdev->dev;
@@ -1001,10 +1018,14 @@ static int stfcamss_probe(struct platform_device *pdev)
                return ret;
        }
 
-       stfcamss->resets = devm_reset_control_array_get_shared(dev);
-       if (IS_ERR(stfcamss->resets)) {
-               st_err(ST_CAMSS, "Failed to get stfcamss reset controls\n");
-               return PTR_ERR(stfcamss->resets);
+       stfcamss->nrsts = ARRAY_SIZE(stfcamss_resets);
+       stfcamss->sys_rst = stfcamss_resets;
+
+       ret = devm_reset_control_bulk_get_exclusive(dev, stfcamss->nrsts,
+               stfcamss->sys_rst);
+       if (ret) {
+               st_err(ST_CAMSS, "Failed to get reset controls\n");
+               return ret;
        }
 
        ret = of_parse_phandle_with_fixed_args(dev->of_node,

diff --git a/drivers/media/platform/starfive/v4l2_driver/stfcamss.h b/drivers/media/platform/starfive/v4l2_driver/stfcamss.h
index 19534ef..cd4fb31 100644 (file)
--- a/drivers/media/platform/starfive/v4l2_driver/stfcamss.h
+++ b/drivers/media/platform/starfive/v4l2_driver/stfcamss.h
@@ -58,6 +58,24 @@ enum stf_clk_num {
        STFCLK_NUM
 };
 
+enum stf_rst_num {
+       STFRST_WRAPPER_P = 0,
+       STFRST_WRAPPER_C,
+       STFRST_PCLK,
+       STFRST_SYS_CLK,
+       STFRST_AXIRD,
+       STFRST_AXIWR,
+       STFRST_PIXEL_CLK_IF0,
+       STFRST_PIXEL_CLK_IF1,
+       STFRST_PIXEL_CLK_IF2,
+       STFRST_PIXEL_CLK_IF3,
+       STFRST_M31DPHY_HW,
+       STFRST_M31DPHY_B09_ALWAYS_ON,
+       STFRST_ISP_TOP_N,
+       STFRST_ISP_TOP_AXI,
+       STFRST_NUM
+};
+
 struct stfcamss {
        struct stf_vin_dev *vin;  // stfcamss phy res
        struct v4l2_device v4l2_dev;
@@ -72,7 +90,8 @@ struct stfcamss {
        struct v4l2_async_notifier notifier;
        struct clk_bulk_data *sys_clk;
        int nclks;
-       struct reset_control *resets;
+       struct reset_control_bulk_data *sys_rst;
+       int nrsts;
        struct regmap *stf_aon_syscon;
        uint32_t aon_gp_reg;
 #ifdef CONFIG_DEBUG_FS