clk: qcom: gcc-sc7180: Mark the MM XO clocks to be always ON
Subsystems (3)
PATCH 1/1 clk: qcom: gcc-sc7180: Mark the MM XO clocks to be always ON
There are intermittent GDSC power-up failures observed for titan top gdsc, which requires the XO clock. Thus mark all the MM XO clocks always enabled from probe.
--- drivers/clk/qcom/gcc-sc7180.c | 47 ++++--------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-)
drivers/clk/qcom/gcc-sc7180.c +4 -43
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. +* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. */ #include <linux/clk-provider.h>
@@ -919,19 +919,6 @@ static struct clk_branch gcc_camera_throttle_hf_axi_clk = { }, }; -static struct clk_branch gcc_camera_xo_clk = { - .halt_reg =0xb02c , - .halt_check =BRANCH_HALT , - .clkr = { - .enable_reg =0xb02c , - .enable_mask =BIT (0 ), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_camera_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -static struct clk_branch gcc_ce1_ahb_clk = { .halt_reg =0x4100c , .halt_check =BRANCH_HALT_VOTED ,
@@ -1096,19 +1083,6 @@ static struct clk_branch gcc_disp_throttle_hf_axi_clk = { }, }; -static struct clk_branch gcc_disp_xo_clk = { - .halt_reg =0xb030 , - .halt_check =BRANCH_HALT , - .clkr = { - .enable_reg =0xb030 , - .enable_mask =BIT (0 ), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_disp_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -static struct clk_branch gcc_gp1_clk = { .halt_reg =0x64000 , .halt_check =BRANCH_HALT ,
@@ -2159,19 +2133,6 @@ static struct clk_branch gcc_video_throttle_axi_clk = { }, }; -static struct clk_branch gcc_video_xo_clk = { - .halt_reg =0xb028 , - .halt_check =BRANCH_HALT , - .clkr = { - .enable_reg =0xb028 , - .enable_mask =BIT (0 ), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_video_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -static struct clk_branch gcc_mss_cfg_ahb_clk = { .halt_reg =0x8a000 , .halt_check =BRANCH_HALT ,
@@ -2304,7 +2265,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_BOOT_ROM_AHB_CLK] = &gcc_boot_rom_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, [GCC_CE1_AHB_CLK] = &gcc_ce1_ahb_clk.clkr, [GCC_CE1_AXI_CLK] = &gcc_ce1_axi_clk.clkr, [GCC_CE1_CLK] = &gcc_ce1_clk.clkr,
@@ -2317,7 +2277,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_DISP_GPLL0_DIV_CLK_SRC] = &gcc_disp_gpll0_div_clk_src.clkr, [GCC_DISP_HF_AXI_CLK] = &gcc_disp_hf_axi_clk.clkr, [GCC_DISP_THROTTLE_HF_AXI_CLK] = &gcc_disp_throttle_hf_axi_clk.clkr, - [GCC_DISP_XO_CLK] = &gcc_disp_xo_clk.clkr, [GCC_GP1_CLK] = &gcc_gp1_clk.clkr, [GCC_GP1_CLK_SRC] = &gcc_gp1_clk_src.clkr, [GCC_GP2_CLK] = &gcc_gp2_clk.clkr,
@@ -2413,7 +2372,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_VIDEO_AXI_CLK] = &gcc_video_axi_clk.clkr, [GCC_VIDEO_GPLL0_DIV_CLK_SRC] = &gcc_video_gpll0_div_clk_src.clkr, [GCC_VIDEO_THROTTLE_AXI_CLK] = &gcc_video_throttle_axi_clk.clkr, - [GCC_VIDEO_XO_CLK] = &gcc_video_xo_clk.clkr, [GPLL0] = &gpll0.clkr, [GPLL0_OUT_EVEN] = &gpll0_out_even.clkr, [GPLL6] = &gpll6.clkr,
@@ -2510,6 +2468,9 @@ static int gcc_sc7180_probe(struct platform_device *pdev)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,0x0b02c ,BIT (0 ),BIT (0 )); +regmap_update_bits (regmap,0x0b028 ,BIT (0 ),BIT (0 )); +regmap_update_bits (regmap,0x0b030 ,BIT (0 ),BIT (0 ));regmap_update_bits (regmap,0x71004 ,BIT (0 ),BIT (0 )); ret = qcom_cc_register_rcg_dfs(regmap, gcc_dfs_clocks,
--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Il 20/01/21 08:47, Taniya Das ha scritto:
Quoted 4 lines
There are intermittent GDSC power-up failures observed for titan top gdsc, which requires the XO clock. Thus mark all the MM XO clocks always enabled from probe.
Hello Tanya,
Quoted 29 lines
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 | 47 ++++--------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-)--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.drivers/clk/qcom/gcc-sc7180.c +1
-4@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. +* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. */ #include <linux/clk-provider.h> @@ -919,19 +919,6 @@ static struct clk_branch gcc_camera_throttle_hf_axi_clk = { }, }; -static struct clk_branch gcc_camera_xo_clk = { - .halt_reg =0xb02c , - .halt_check =BRANCH_HALT ,
drivers/clk/qcom/gcc-sc7180.c static struct clk_branch gcc_camera_throttle_hf_axi_clk = { · line 934
Quoted 10 lines
drivers/clk/qcom/gcc-sc7180.c +0
-10- .clkr = { - .enable_reg = 0xb02c, - .enable_mask = BIT(0), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_camera_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -
Why are you avoiding to register these clocks entirely? If this is needed by the Titan GDSC, this clock "does indeed exist".
If these clocks shall never be turned off, then you should add the CLK_IS_CRITICAL flag and perhaps add a comment explaining why.
Quoted 10 lines
drivers/clk/qcom/gcc-sc7180.c +0
-3static struct clk_branch gcc_ce1_ahb_clk = { .halt_reg =0x4100c , .halt_check =BRANCH_HALT_VOTED ,@@ -1096,19 +1083,6 @@ static struct clk_branch gcc_disp_throttle_hf_axi_clk = { }, }; -static struct clk_branch gcc_disp_xo_clk = { - .halt_reg =0xb030 , - .halt_check =BRANCH_HALT ,
drivers/clk/qcom/gcc-sc7180.c static struct clk_branch gcc_disp_throttle_hf_axi_clk = { · line 1111
Quoted 10 lines
drivers/clk/qcom/gcc-sc7180.c +0
-10- .clkr = { - .enable_reg = 0xb030, - .enable_mask = BIT(0), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_disp_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -
Same here.
Quoted 10 lines
drivers/clk/qcom/gcc-sc7180.c +0
-3static struct clk_branch gcc_gp1_clk = { .halt_reg =0x64000 , .halt_check =BRANCH_HALT ,@@ -2159,19 +2133,6 @@ static struct clk_branch gcc_video_throttle_axi_clk = { }, }; -static struct clk_branch gcc_video_xo_clk = { - .halt_reg =0xb028 , - .halt_check =BRANCH_HALT ,
drivers/clk/qcom/gcc-sc7180.c static struct clk_branch gcc_video_throttle_axi_clk = { · line 2174
Quoted 10 lines
drivers/clk/qcom/gcc-sc7180.c +0
-10- .clkr = { - .enable_reg = 0xb028, - .enable_mask = BIT(0), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_video_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -
...and here.
Quoted 28 lines
drivers/clk/qcom/gcc-sc7180.c +0
-3static struct clk_branch gcc_mss_cfg_ahb_clk = { .halt_reg =0x8a000 , .halt_check =BRANCH_HALT ,@@ -2304,7 +2265,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_BOOT_ROM_AHB_CLK] = &gcc_boot_rom_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, [GCC_CE1_AHB_CLK] = &gcc_ce1_ahb_clk.clkr, [GCC_CE1_AXI_CLK] = &gcc_ce1_axi_clk.clkr, [GCC_CE1_CLK] = &gcc_ce1_clk.clkr,@@ -2317,7 +2277,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_DISP_GPLL0_DIV_CLK_SRC] = &gcc_disp_gpll0_div_clk_src.clkr, [GCC_DISP_HF_AXI_CLK] = &gcc_disp_hf_axi_clk.clkr, [GCC_DISP_THROTTLE_HF_AXI_CLK] = &gcc_disp_throttle_hf_axi_clk.clkr, - [GCC_DISP_XO_CLK] = &gcc_disp_xo_clk.clkr, [GCC_GP1_CLK] = &gcc_gp1_clk.clkr, [GCC_GP1_CLK_SRC] = &gcc_gp1_clk_src.clkr, [GCC_GP2_CLK] = &gcc_gp2_clk.clkr,@@ -2413,7 +2372,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_VIDEO_AXI_CLK] = &gcc_video_axi_clk.clkr, [GCC_VIDEO_GPLL0_DIV_CLK_SRC] = &gcc_video_gpll0_div_clk_src.clkr, [GCC_VIDEO_THROTTLE_AXI_CLK] = &gcc_video_throttle_axi_clk.clkr, - [GCC_VIDEO_XO_CLK] = &gcc_video_xo_clk.clkr, [GPLL0] = &gpll0.clkr, [GPLL0_OUT_EVEN] = &gpll0_out_even.clkr, [GPLL6] = &gpll6.clkr,
drivers/clk/qcom/gcc-sc7180.c static int gcc_sc7180_probe(struct platform_device *pdev) · line 2473
Quoted 6 lines
drivers/clk/qcom/gcc-sc7180.c +3
-0@@ -2510,6 +2468,9 @@ static int gcc_sc7180_probe(struct platform_device *pdev)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,0x0b02c ,BIT (0 ),BIT (0 )); +regmap_update_bits (regmap,0x0b028 ,BIT (0 ),BIT (0 )); +regmap_update_bits (regmap,0x0b030 ,BIT (0 ),BIT (0 ));
IMO, "Magic" regmap writes like these ones, even if documented, should be avoided in this specific case, since the clocks framework accounts for clocks that should be always-on, if provided with the right flags.
Quoted 4 lines
drivers/clk/qcom/gcc-sc7180.c +0
-0regmap_update_bits (regmap,0x71004 ,BIT (0 ),BIT (0 )); ret = qcom_cc_register_rcg_dfs(regmap, gcc_dfs_clocks,
Quoted 4 lines · Taniya Das
There are intermittent GDSC power-up failures observed for titan top gdsc, which requires the XO clock. Thus mark all the MM XO clocks always enabled from probe.
But if this is the reason for keeping all these {ahb,xo}_clks critical (or upstream just a bunch of hard coded regmap_update_bits()) why don't we properly describe them as dependencies for the clock controller/gdsc? I.e. by the use of pm_clk_add()?
Regards,
Bjorn
Quoted 116 lines
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 | 47 ++++--------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-)drivers/clk/qcom/gcc-sc7180.c +4
-44@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. +* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. */ #include <linux/clk-provider.h> @@ -919,19 +919,6 @@ static struct clk_branch gcc_camera_throttle_hf_axi_clk = { }, }; -static struct clk_branch gcc_camera_xo_clk = { - .halt_reg =0xb02c , - .halt_check =BRANCH_HALT , - .clkr = { - .enable_reg =0xb02c , - .enable_mask =BIT (0 ), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_camera_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -static struct clk_branch gcc_ce1_ahb_clk = { .halt_reg =0x4100c , .halt_check =BRANCH_HALT_VOTED ,@@ -1096,19 +1083,6 @@ static struct clk_branch gcc_disp_throttle_hf_axi_clk = { }, }; -static struct clk_branch gcc_disp_xo_clk = { - .halt_reg =0xb030 , - .halt_check =BRANCH_HALT , - .clkr = { - .enable_reg =0xb030 , - .enable_mask =BIT (0 ), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_disp_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -static struct clk_branch gcc_gp1_clk = { .halt_reg =0x64000 , .halt_check =BRANCH_HALT ,@@ -2159,19 +2133,6 @@ static struct clk_branch gcc_video_throttle_axi_clk = { }, }; -static struct clk_branch gcc_video_xo_clk = { - .halt_reg =0xb028 , - .halt_check =BRANCH_HALT , - .clkr = { - .enable_reg =0xb028 , - .enable_mask =BIT (0 ), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_video_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -static struct clk_branch gcc_mss_cfg_ahb_clk = { .halt_reg =0x8a000 , .halt_check =BRANCH_HALT ,@@ -2304,7 +2265,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_BOOT_ROM_AHB_CLK] = &gcc_boot_rom_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, [GCC_CE1_AHB_CLK] = &gcc_ce1_ahb_clk.clkr, [GCC_CE1_AXI_CLK] = &gcc_ce1_axi_clk.clkr, [GCC_CE1_CLK] = &gcc_ce1_clk.clkr,@@ -2317,7 +2277,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_DISP_GPLL0_DIV_CLK_SRC] = &gcc_disp_gpll0_div_clk_src.clkr, [GCC_DISP_HF_AXI_CLK] = &gcc_disp_hf_axi_clk.clkr, [GCC_DISP_THROTTLE_HF_AXI_CLK] = &gcc_disp_throttle_hf_axi_clk.clkr, - [GCC_DISP_XO_CLK] = &gcc_disp_xo_clk.clkr, [GCC_GP1_CLK] = &gcc_gp1_clk.clkr, [GCC_GP1_CLK_SRC] = &gcc_gp1_clk_src.clkr, [GCC_GP2_CLK] = &gcc_gp2_clk.clkr,@@ -2413,7 +2372,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_VIDEO_AXI_CLK] = &gcc_video_axi_clk.clkr, [GCC_VIDEO_GPLL0_DIV_CLK_SRC] = &gcc_video_gpll0_div_clk_src.clkr, [GCC_VIDEO_THROTTLE_AXI_CLK] = &gcc_video_throttle_axi_clk.clkr, - [GCC_VIDEO_XO_CLK] = &gcc_video_xo_clk.clkr, [GPLL0] = &gpll0.clkr, [GPLL0_OUT_EVEN] = &gpll0_out_even.clkr, [GPLL6] = &gpll6.clkr,@@ -2510,6 +2468,9 @@ static int gcc_sc7180_probe(struct platform_device *pdev)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,0x0b02c ,BIT (0 ),BIT (0 )); +regmap_update_bits (regmap,0x0b028 ,BIT (0 ),BIT (0 )); +regmap_update_bits (regmap,0x0b030 ,BIT (0 ),BIT (0 ));regmap_update_bits (regmap,0x71004 ,BIT (0 ),BIT (0 )); ret = qcom_cc_register_rcg_dfs(regmap, gcc_dfs_clocks, --Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Stephen Boyd
maintainerQuoting AngeloGioacchino Del Regno (2021-01-20 01:16:17)
Quoted 51 lines
Il 20/01/21 08:47, Taniya Das ha scritto:
Quoted 4 lines
There are intermittent GDSC power-up failures observed for titan top gdsc, which requires the XO clock. Thus mark all the MM XO clocks always enabled from probe.
Hello Tanya,
Quoted 29 lines
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 | 47 ++++--------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-)--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.drivers/clk/qcom/gcc-sc7180.c +1
-4@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. +* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. */ #include <linux/clk-provider.h> @@ -919,19 +919,6 @@ static struct clk_branch gcc_camera_throttle_hf_axi_clk = { }, }; -static struct clk_branch gcc_camera_xo_clk = { - .halt_reg =0xb02c , - .halt_check =BRANCH_HALT ,drivers/clk/qcom/gcc-sc7180.c static struct clk_branch gcc_camera_throttle_hf_axi_clk = { · line 934
Quoted 10 lines
drivers/clk/qcom/gcc-sc7180.c +0
-10- .clkr = { - .enable_reg = 0xb02c, - .enable_mask = BIT(0), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_camera_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -Why are you avoiding to register these clocks entirely? If this is needed by the Titan GDSC, this clock "does indeed exist".
Quoted 2 lines
If these clocks shall never be turned off, then you should add the
CLK_IS_CRITICALflag and perhaps add a comment explaining why.
I'd rather not have critical clks wasting kernel memory and registration time if they're never going to be turned off and we're basically just writing a bit so that they're always on. This patch looks OK to me from that perspective. There aren't any parents for these clks either so really it's a glorified bit toggle and poll to make sure that it is enabled. Maybe we should be checking that they're actually enabled at the end of probe, but otherwise we don't need all this complexity.
Hi Bjorn,
Quoted 7 lines · Bjorn Andersson
Quoted 4 lines · Taniya Das
There are intermittent GDSC power-up failures observed for titan top gdsc, which requires the XO clock. Thus mark all the MM XO clocks always enabled from probe.
Quoted 7 lines
But if this is the reason for keeping all these {ahb,xo}_clks critical (or upstream just a bunch of hard coded
regmap_update_bits()) why don't we properly describe them as dependencies for the clock controller/gdsc? I.e. by the use ofpm_clk_add()?Regards,
Bjorn
They are already defined in the camcc driver, but they are not working as expected, thus I am forced to mark them always ON.
Quoted 117 lines
Quoted 117 lines
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 | 47 ++++--------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-)drivers/clk/qcom/gcc-sc7180.c +4
-44@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. +* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. */ #include <linux/clk-provider.h> @@ -919,19 +919,6 @@ static struct clk_branch gcc_camera_throttle_hf_axi_clk = { }, }; -static struct clk_branch gcc_camera_xo_clk = { - .halt_reg =0xb02c , - .halt_check =BRANCH_HALT , - .clkr = { - .enable_reg =0xb02c , - .enable_mask =BIT (0 ), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_camera_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -static struct clk_branch gcc_ce1_ahb_clk = { .halt_reg =0x4100c , .halt_check =BRANCH_HALT_VOTED ,@@ -1096,19 +1083,6 @@ static struct clk_branch gcc_disp_throttle_hf_axi_clk = { }, }; -static struct clk_branch gcc_disp_xo_clk = { - .halt_reg =0xb030 , - .halt_check =BRANCH_HALT , - .clkr = { - .enable_reg =0xb030 , - .enable_mask =BIT (0 ), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_disp_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -static struct clk_branch gcc_gp1_clk = { .halt_reg =0x64000 , .halt_check =BRANCH_HALT ,@@ -2159,19 +2133,6 @@ static struct clk_branch gcc_video_throttle_axi_clk = { }, }; -static struct clk_branch gcc_video_xo_clk = { - .halt_reg =0xb028 , - .halt_check =BRANCH_HALT , - .clkr = { - .enable_reg =0xb028 , - .enable_mask =BIT (0 ), - .hw.init = &(struct clk_init_data ){ - .name ="gcc_video_xo_clk" , - .ops = &clk_branch2_ops, - }, - }, -}; -static struct clk_branch gcc_mss_cfg_ahb_clk = { .halt_reg =0x8a000 , .halt_check =BRANCH_HALT ,@@ -2304,7 +2265,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_BOOT_ROM_AHB_CLK] = &gcc_boot_rom_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, [GCC_CE1_AHB_CLK] = &gcc_ce1_ahb_clk.clkr, [GCC_CE1_AXI_CLK] = &gcc_ce1_axi_clk.clkr, [GCC_CE1_CLK] = &gcc_ce1_clk.clkr,@@ -2317,7 +2277,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_DISP_GPLL0_DIV_CLK_SRC] = &gcc_disp_gpll0_div_clk_src.clkr, [GCC_DISP_HF_AXI_CLK] = &gcc_disp_hf_axi_clk.clkr, [GCC_DISP_THROTTLE_HF_AXI_CLK] = &gcc_disp_throttle_hf_axi_clk.clkr, - [GCC_DISP_XO_CLK] = &gcc_disp_xo_clk.clkr, [GCC_GP1_CLK] = &gcc_gp1_clk.clkr, [GCC_GP1_CLK_SRC] = &gcc_gp1_clk_src.clkr, [GCC_GP2_CLK] = &gcc_gp2_clk.clkr,@@ -2413,7 +2372,6 @@ static struct clk_regmap *gcc_sc7180_clocks[] = { [GCC_VIDEO_AXI_CLK] = &gcc_video_axi_clk.clkr, [GCC_VIDEO_GPLL0_DIV_CLK_SRC] = &gcc_video_gpll0_div_clk_src.clkr, [GCC_VIDEO_THROTTLE_AXI_CLK] = &gcc_video_throttle_axi_clk.clkr, - [GCC_VIDEO_XO_CLK] = &gcc_video_xo_clk.clkr, [GPLL0] = &gpll0.clkr, [GPLL0_OUT_EVEN] = &gpll0_out_even.clkr, [GPLL6] = &gpll6.clkr,@@ -2510,6 +2468,9 @@ static int gcc_sc7180_probe(struct platform_device *pdev)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,0x0b02c ,BIT (0 ),BIT (0 )); +regmap_update_bits (regmap,0x0b028 ,BIT (0 ),BIT (0 )); +regmap_update_bits (regmap,0x0b030 ,BIT (0 ),BIT (0 ));regmap_update_bits (regmap,0x71004 ,BIT (0 ),BIT (0 )); ret = qcom_cc_register_rcg_dfs(regmap, gcc_dfs_clocks, --Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.
Signature · 4 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation. --
Quoting Taniya Das (2021-01-19 23:47:51)
Quoted 7 lines
There are intermittent GDSC power-up failures observed for titan top gdsc, which requires the XO clock. Thus mark all the MM XO clocks always enabled from probe.
Fixes 8d4025943e13 ("clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones")Signed-off-by Taniya Das <[email protected]>---
Applied to clk-next