media: starfive: Delete isp noc bus clock
authorchanghuang.liang <changhuang.liang@starfivetech.com>
Wed, 19 Oct 2022 03:03:54 +0000 (11:03 +0800)
committermason.huo <mason.huo@starfivetech.com>
Thu, 27 Oct 2022 05:55:41 +0000 (13:55 +0800)
Delete operate isp noc bus clock in vin module.

Signed-off-by: changhuang.liang <changhuang.liang@starfivetech.com>
drivers/media/platform/starfive/v4l2_driver/stfcamss.c
drivers/media/platform/starfive/v4l2_driver/stfcamss.h

index 3f2d4f1..11dbb85 100644 (file)
@@ -21,7 +21,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/uaccess.h>
 #include <linux/mfd/syscon.h>
-#include <linux/clk-provider.h>
 
 #include <linux/videodev2.h>
 
@@ -72,7 +71,6 @@ static struct clk_bulk_data stfcamss_clocks[] = {
        { .id = "clk_m31dphy_txclkesc_lan0" },
        { .id = "clk_ispcore_2x" },
        { .id = "clk_isp_axi" },
-       { .id = "clk_noc_bus_clk_isp_axi" },
 };
 
 static struct reset_control_bulk_data stfcamss_resets[] = {
@@ -1297,11 +1295,6 @@ static int stfcamss_runtime_suspend(struct device *dev)
 {
        struct stfcamss *stfcamss = dev_get_drvdata(dev);
 
-       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);
-       else
-               st_warn(ST_VIN, "noc_bus_clk_isp_axi already enable\n");
-
        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);
index 186c03b..41cac3b 100644 (file)
@@ -56,7 +56,6 @@ enum stf_clk_num {
        STFCLK_M31DPHY_TXCLKESC_LAN0,
        STFCLK_ISPCORE_2X,
        STFCLK_ISP_AXI,
-       STFCLK_NOC_BUS_CLK_ISP_AXI,
        STFCLK_NUM
 };