Skip to contentSkip to conversation

clk: qcom: Remove LPASS_CC config for GCC lpass clocks

PATCH In review Taniya Das 2 participants 2 messages Dec 5, 2018

Subsystems (3)
Arm Qualcomm mailing list Common clk Qualcomm clock drivers
lore
Share & tools
lore

Taniya Das

author
#0 lore raw

PATCH 1/1 clk: qcom: Remove LPASS_CC config for GCC lpass clocks

The GCC lpass clocks are updated as protected, so clean up the ifdefers.

Signed-off-by Taniya Das <[email protected]>
---
 drivers/clk/qcom/gcc-sdm845.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/clk/qcom/gcc-sdm845.c +0 -5
index c782e62..ba8ff99 100644
@@ -3153,8 +3153,6 @@ enum {
 	},
 };
 
-/* TODO: Remove after DTS updated to protect these */
-#ifdef CONFIG_SDM_LPASSCC_845
 static struct clk_branch gcc_lpass_q6_axi_clk = {
 	.halt_reg = 0x47000,
 	.halt_check = BRANCH_HALT,

@@ -3182,7 +3180,6 @@ enum {
 		},
 	},
 };
-#endif
 
 static struct gdsc pcie_0_gdsc = {
 	.gdscr = 0x6b004,

@@ -3484,10 +3481,8 @@ enum {
 	[GCC_QSPI_CORE_CLK_SRC] = &gcc_qspi_core_clk_src.clkr,
 	[GCC_QSPI_CORE_CLK] = &gcc_qspi_core_clk.clkr,
 	[GCC_QSPI_CNOC_PERIPH_AHB_CLK] = &gcc_qspi_cnoc_periph_ahb_clk.clkr,
-#ifdef CONFIG_SDM_LPASSCC_845
 	[GCC_LPASS_Q6_AXI_CLK] = &gcc_lpass_q6_axi_clk.clkr,
 	[GCC_LPASS_SWAY_CLK] = &gcc_lpass_sway_clk.clkr,
-#endif
 };
 
 static const struct qcom_reset_map gcc_sdm845_resets[] = {

--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member of the Code Aurora Forum, hosted by the Linux Foundation.

maintainer
#1 lore raw

Quoting Taniya Das (2018-12-05 00:02:00)

Quoted 4 lines

The GCC lpass clocks are updated as protected, so clean up the ifdefers.

Signed-off-by Taniya Das <[email protected]>

---

Ok. But this will have to wait for a few months until everything is merged together. Was that the intention of sending this now instead of later?