Skip to content

Commit 05cf3ec

Browse files
lumagbebarino
authored andcommitted
clk: qcom: gcc-msm8996: Drop (again) gcc_aggre1_pnoc_ahb_clk
The gcc_aggre1_pnoc_ahb_clk is crucial for the proper MSM8996/APQ8096 functioning. If it gets disabled, several subsytems will stop working (including eMMC/SDCC and USB). There are no in-kernel users of this clock, so it is much simpler to remove from the kernel. The clock was first removed in the commit 9e60de1 ("clk: qcom: Remove gcc_aggre1_pnoc_ahb_clk from msm8996") by Stephen Boyd, but got added back in the commit b567752 ("clk: qcom: Add some missing gcc clks for msm8996") by Rajendra Nayak. Let's remove it again in hope that nobody adds it back. Reported-by: Vladimir Zapolskiy <[email protected]> Cc: Rajendra Nayak <[email protected]> Cc: Konrad Dybcio <[email protected]> Fixes: b567752 ("clk: qcom: Add some missing gcc clks for msm8996") Signed-off-by: Dmitry Baryshkov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Stephen Boyd <[email protected]>
1 parent 289ebc4 commit 05cf3ec

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

drivers/clk/qcom/gcc-msm8996.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2937,20 +2937,6 @@ static struct clk_branch gcc_smmu_aggre0_ahb_clk = {
29372937
},
29382938
};
29392939

2940-
static struct clk_branch gcc_aggre1_pnoc_ahb_clk = {
2941-
.halt_reg = 0x82014,
2942-
.clkr = {
2943-
.enable_reg = 0x82014,
2944-
.enable_mask = BIT(0),
2945-
.hw.init = &(struct clk_init_data){
2946-
.name = "gcc_aggre1_pnoc_ahb_clk",
2947-
.parent_names = (const char *[]){ "periph_noc_clk_src" },
2948-
.num_parents = 1,
2949-
.ops = &clk_branch2_ops,
2950-
},
2951-
},
2952-
};
2953-
29542940
static struct clk_branch gcc_aggre2_ufs_axi_clk = {
29552941
.halt_reg = 0x83014,
29562942
.clkr = {
@@ -3474,7 +3460,6 @@ static struct clk_regmap *gcc_msm8996_clocks[] = {
34743460
[GCC_AGGRE0_CNOC_AHB_CLK] = &gcc_aggre0_cnoc_ahb_clk.clkr,
34753461
[GCC_SMMU_AGGRE0_AXI_CLK] = &gcc_smmu_aggre0_axi_clk.clkr,
34763462
[GCC_SMMU_AGGRE0_AHB_CLK] = &gcc_smmu_aggre0_ahb_clk.clkr,
3477-
[GCC_AGGRE1_PNOC_AHB_CLK] = &gcc_aggre1_pnoc_ahb_clk.clkr,
34783463
[GCC_AGGRE2_UFS_AXI_CLK] = &gcc_aggre2_ufs_axi_clk.clkr,
34793464
[GCC_AGGRE2_USB3_AXI_CLK] = &gcc_aggre2_usb3_axi_clk.clkr,
34803465
[GCC_QSPI_AHB_CLK] = &gcc_qspi_ahb_clk.clkr,

0 commit comments

Comments
 (0)