From: changhuang.liang Date: Wed, 19 Oct 2022 03:03:54 +0000 (+0800) Subject: media: starfive: Delete isp noc bus clock X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6dad039d459555463b0f767149b6b90b679db94d;p=platform%2Fkernel%2Flinux-starfive.git media: starfive: Delete isp noc bus clock Delete operate isp noc bus clock in vin module. Signed-off-by: changhuang.liang --- diff --git a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c index 3f2d4f1f7243..11dbb85c5e5e 100644 --- a/drivers/media/platform/starfive/v4l2_driver/stfcamss.c +++ b/drivers/media/platform/starfive/v4l2_driver/stfcamss.c @@ -21,7 +21,6 @@ #include #include #include -#include #include @@ -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); diff --git a/drivers/media/platform/starfive/v4l2_driver/stfcamss.h b/drivers/media/platform/starfive/v4l2_driver/stfcamss.h index 186c03b8034e..41cac3b2a731 100644 --- a/drivers/media/platform/starfive/v4l2_driver/stfcamss.h +++ b/drivers/media/platform/starfive/v4l2_driver/stfcamss.h @@ -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 };