clk: qcom: gcc-sc7180: Mark the camera abh clock always ON
Subsystems (3)
PATCH 1/1 clk: qcom: gcc-sc7180: Mark the camera abh clock always ON
The camera clock controller requires the AHB clock, the driver when moved to use the pm_runtime_get() API, the camera ahb clock failed turn on before access, thus mark it as always ON.
Reported-by Stephen Boyd <[email protected]>
Fixes 8d4025943e13 ("clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones")
Signed-off-by Taniya Das <[email protected]>
--- drivers/clk/qcom/gcc-sc7180.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-)
drivers/clk/qcom/gcc-sc7180.c +3 -18
@@ -891,21 +891,6 @@ static struct clk_branch gcc_boot_rom_ahb_clk = { }, }; -static struct clk_branch gcc_camera_ahb_clk = { - .halt_reg =0xb008 , - .halt_check =BRANCH_HALT , - .hwcg_reg =0xb008 , - .hwcg_bit =1 , - .clkr = { - .enable_reg =0xb008 , - .enable_mask =BIT (0 ), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_camera_ahb_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -static struct clk_branch gcc_camera_hf_axi_clk = { .halt_reg =0xb020 , .halt_check =BRANCH_HALT ,
@@ -2317,7 +2302,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_AGGRE_UFS_PHY_AXI_CLK] = &gcc_aggre_ufs_phy_axi_clk.clkr, [GCC_AGGRE_USB3_PRIM_AXI_CLK] = &gcc_aggre_usb3_prim_axi_clk.clkr, [GCC_BOOT_ROM_AHB_CLK] = &gcc_boot_rom_ahb_clk.clkr, - [GCC_CAMERA_AHB_CLK] = &gcc_camera_ahb_clk.clkr, [GCC_CAMERA_HF_AXI_CLK] = &gcc_camera_hf_axi_clk.clkr, [GCC_CAMERA_THROTTLE_HF_AXI_CLK] = &gcc_camera_throttle_hf_axi_clk.clkr, [GCC_CAMERA_XO_CLK] = &gcc_camera_xo_clk.clkr,
@@ -2519,11 +2503,12 @@ static int gcc_sc7180_probe(struct platform_device *pdev)/* * Keep the clocks always-ON -* GCC_CPUSS_GNOC_CLK, GCC_VIDEO_AHB_CLK, GCC_DISP_AHB_CLK -* GCC_GPU_CFG_AHB_CLK +* GCC_CPUSS_GNOC_CLK, GCC_VIDEO_AHB_CLK, GCC_CAMERA_AHB_CLK, +* GCC_DISP_AHB_CLK, GCC_GPU_CFG_AHB_CLK */ regmap_update_bits (regmap,0x48004 ,BIT (0 ),BIT (0 ));regmap_update_bits (regmap,0x0b004 ,BIT (0 ),BIT (0 )); +regmap_update_bits (regmap,0x0b008 ,BIT (0 ),BIT (0 ));regmap_update_bits (regmap,0x0b00c ,BIT (0 ),BIT (0 ));regmap_update_bits (regmap,0x71004 ,BIT (0 ),BIT (0 ));
--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Quoting Taniya Das (2020-12-21 10:03:36)
Quoted 8 lines
The camera clock controller requires the AHB clock, the driver when moved to use the
pm_runtime_get()API, the camera ahb clock failed turn on before access, thus mark it as always ON.Reported-by Stephen Boyd <[email protected]>Fixes 8d4025943e13 ("clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones")Signed-off-by Taniya Das <[email protected]>---
Applied to clk-fixes