Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Fixes: 8d4025943e13 ("clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones")
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Link: https://lore.kernel.org/r/1611128871-5898-1-git-send-email-tdas@codeaurora.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Taniya Das and committed by
Stephen Boyd
d79dfa19 8a1f7fb1

+4 -43
+4 -43
drivers/clk/qcom/gcc-sc7180.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0-only 2 2 /* 3 - * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. 3 + * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. 4 4 */ 5 5 6 6 #include <linux/clk-provider.h> ··· 934 934 }, 935 935 }; 936 936 937 - static struct clk_branch gcc_camera_xo_clk = { 938 - .halt_reg = 0xb02c, 939 - .halt_check = BRANCH_HALT, 940 - .clkr = { 941 - .enable_reg = 0xb02c, 942 - .enable_mask = BIT(0), 943 - .hw.init = &(struct clk_init_data){ 944 - .name = "gcc_camera_xo_clk", 945 - .ops = &clk_branch2_ops, 946 - }, 947 - }, 948 - }; 949 - 950 937 static struct clk_branch gcc_ce1_ahb_clk = { 951 938 .halt_reg = 0x4100c, 952 939 .halt_check = BRANCH_HALT_VOTED, ··· 1093 1106 .enable_mask = BIT(0), 1094 1107 .hw.init = &(struct clk_init_data){ 1095 1108 .name = "gcc_disp_throttle_hf_axi_clk", 1096 - .ops = &clk_branch2_ops, 1097 - }, 1098 - }, 1099 - }; 1100 - 1101 - static struct clk_branch gcc_disp_xo_clk = { 1102 - .halt_reg = 0xb030, 1103 - .halt_check = BRANCH_HALT, 1104 - .clkr = { 1105 - .enable_reg = 0xb030, 1106 - .enable_mask = BIT(0), 1107 - .hw.init = &(struct clk_init_data){ 1108 - .name = "gcc_disp_xo_clk", 1109 1109 .ops = &clk_branch2_ops, 1110 1110 }, 1111 1111 }, ··· 2148 2174 }, 2149 2175 }; 2150 2176 2151 - static struct clk_branch gcc_video_xo_clk = { 2152 - .halt_reg = 0xb028, 2153 - .halt_check = BRANCH_HALT, 2154 - .clkr = { 2155 - .enable_reg = 0xb028, 2156 - .enable_mask = BIT(0), 2157 - .hw.init = &(struct clk_init_data){ 2158 - .name = "gcc_video_xo_clk", 2159 - .ops = &clk_branch2_ops, 2160 - }, 2161 - }, 2162 - }; 2163 - 2164 2177 static struct clk_branch gcc_mss_cfg_ahb_clk = { 2165 2178 .halt_reg = 0x8a000, 2166 2179 .halt_check = BRANCH_HALT, ··· 2281 2320 [GCC_CAMERA_AHB_CLK] = &gcc_camera_ahb_clk.clkr, 2282 2321 [GCC_CAMERA_HF_AXI_CLK] = &gcc_camera_hf_axi_clk.clkr, 2283 2322 [GCC_CAMERA_THROTTLE_HF_AXI_CLK] = &gcc_camera_throttle_hf_axi_clk.clkr, 2284 - [GCC_CAMERA_XO_CLK] = &gcc_camera_xo_clk.clkr, 2285 2323 [GCC_CE1_AHB_CLK] = &gcc_ce1_ahb_clk.clkr, 2286 2324 [GCC_CE1_AXI_CLK] = &gcc_ce1_axi_clk.clkr, 2287 2325 [GCC_CE1_CLK] = &gcc_ce1_clk.clkr, ··· 2293 2333 [GCC_DISP_GPLL0_DIV_CLK_SRC] = &gcc_disp_gpll0_div_clk_src.clkr, 2294 2334 [GCC_DISP_HF_AXI_CLK] = &gcc_disp_hf_axi_clk.clkr, 2295 2335 [GCC_DISP_THROTTLE_HF_AXI_CLK] = &gcc_disp_throttle_hf_axi_clk.clkr, 2296 - [GCC_DISP_XO_CLK] = &gcc_disp_xo_clk.clkr, 2297 2336 [GCC_GP1_CLK] = &gcc_gp1_clk.clkr, 2298 2337 [GCC_GP1_CLK_SRC] = &gcc_gp1_clk_src.clkr, 2299 2338 [GCC_GP2_CLK] = &gcc_gp2_clk.clkr, ··· 2388 2429 [GCC_VIDEO_AXI_CLK] = &gcc_video_axi_clk.clkr, 2389 2430 [GCC_VIDEO_GPLL0_DIV_CLK_SRC] = &gcc_video_gpll0_div_clk_src.clkr, 2390 2431 [GCC_VIDEO_THROTTLE_AXI_CLK] = &gcc_video_throttle_axi_clk.clkr, 2391 - [GCC_VIDEO_XO_CLK] = &gcc_video_xo_clk.clkr, 2392 2432 [GPLL0] = &gpll0.clkr, 2393 2433 [GPLL0_OUT_EVEN] = &gpll0_out_even.clkr, 2394 2434 [GPLL6] = &gpll6.clkr, ··· 2483 2525 regmap_update_bits(regmap, 0x48004, BIT(0), BIT(0)); 2484 2526 regmap_update_bits(regmap, 0x0b004, BIT(0), BIT(0)); 2485 2527 regmap_update_bits(regmap, 0x0b00c, BIT(0), BIT(0)); 2528 + regmap_update_bits(regmap, 0x0b02c, BIT(0), BIT(0)); 2529 + regmap_update_bits(regmap, 0x0b028, BIT(0), BIT(0)); 2530 + regmap_update_bits(regmap, 0x0b030, BIT(0), BIT(0)); 2486 2531 regmap_update_bits(regmap, 0x71004, BIT(0), BIT(0)); 2487 2532 2488 2533 ret = qcom_cc_register_rcg_dfs(regmap, gcc_dfs_clocks,