Skip to content

Commit 471e287

Browse files
z3ntuandersson
authored andcommitted
clk: qcom: mmcc-msm8974: remove ocmemcx_ahb_clk
According to a commit in the 3.4 vendor kernel sources[0] the ocmemcx_ahb_clk clock "is controlled by RPM and should not be touched by APPS.". [0] https://git.codelinaro.org/clo/la/kernel/msm/-/commit/37df5f2d91b4d5768b37fcaacaeea958dd683ebc And indeed, when using MDSS+GPU+OCMEM on MSM8226 and not using clk_ignore_unused, when Linux tries to disable the clock the device crashes and reboots. And since there's also no evidence of this clock in msm8974 vendor kernel sources, remove the clock for msm8226 and msm8974. Fixes: d8b2120 ("clk: qcom: Add support for MSM8974's multimedia clock controller (MMCC)") Signed-off-by: Luca Weiss <[email protected]> Reviewed-by: Konrad Dybcio <[email protected]> Link: https://lore.kernel.org/r/20230902-msm8226-ocmemcx_ahb_clk-remove-v1-1-8124dbde83b9@z3ntu.xyz Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 1fc62c8 commit 471e287

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

drivers/clk/qcom/mmcc-msm8974.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2170,22 +2170,6 @@ static struct clk_branch mmss_s0_axi_clk = {
21702170
},
21712171
};
21722172

2173-
static struct clk_branch ocmemcx_ahb_clk = {
2174-
.halt_reg = 0x405c,
2175-
.clkr = {
2176-
.enable_reg = 0x405c,
2177-
.enable_mask = BIT(0),
2178-
.hw.init = &(struct clk_init_data){
2179-
.name = "ocmemcx_ahb_clk",
2180-
.parent_hws = (const struct clk_hw*[]){
2181-
&mmss_ahb_clk_src.clkr.hw
2182-
},
2183-
.num_parents = 1,
2184-
.ops = &clk_branch2_ops,
2185-
},
2186-
},
2187-
};
2188-
21892173
static struct clk_branch ocmemcx_ocmemnoc_clk = {
21902174
.halt_reg = 0x4058,
21912175
.clkr = {
@@ -2503,7 +2487,6 @@ static struct clk_regmap *mmcc_msm8226_clocks[] = {
25032487
[MMSS_MMSSNOC_BTO_AHB_CLK] = &mmss_mmssnoc_bto_ahb_clk.clkr,
25042488
[MMSS_MMSSNOC_AXI_CLK] = &mmss_mmssnoc_axi_clk.clkr,
25052489
[MMSS_S0_AXI_CLK] = &mmss_s0_axi_clk.clkr,
2506-
[OCMEMCX_AHB_CLK] = &ocmemcx_ahb_clk.clkr,
25072490
[OXILI_GFX3D_CLK] = &oxili_gfx3d_clk.clkr,
25082491
[OXILICX_AHB_CLK] = &oxilicx_ahb_clk.clkr,
25092492
[OXILICX_AXI_CLK] = &oxilicx_axi_clk.clkr,
@@ -2660,7 +2643,6 @@ static struct clk_regmap *mmcc_msm8974_clocks[] = {
26602643
[MMSS_MMSSNOC_BTO_AHB_CLK] = &mmss_mmssnoc_bto_ahb_clk.clkr,
26612644
[MMSS_MMSSNOC_AXI_CLK] = &mmss_mmssnoc_axi_clk.clkr,
26622645
[MMSS_S0_AXI_CLK] = &mmss_s0_axi_clk.clkr,
2663-
[OCMEMCX_AHB_CLK] = &ocmemcx_ahb_clk.clkr,
26642646
[OCMEMCX_OCMEMNOC_CLK] = &ocmemcx_ocmemnoc_clk.clkr,
26652647
[OCMEMNOC_CLK] = &ocmemnoc_clk.clkr,
26662648
[OXILI_GFX3D_CLK] = &oxili_gfx3d_clk.clkr,

include/dt-bindings/clock/qcom,mmcc-msm8974.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
#define MMSS_MMSSNOC_BTO_AHB_CLK 112
122122
#define MMSS_MMSSNOC_AXI_CLK 113
123123
#define MMSS_S0_AXI_CLK 114
124-
#define OCMEMCX_AHB_CLK 115
125124
#define OCMEMCX_OCMEMNOC_CLK 116
126125
#define OXILI_OCMEMGX_CLK 117
127126
#define OCMEMNOC_CLK 118

0 commit comments

Comments
 (0)