Patchwork clk: qcom: Remove LPASS_CC config for GCC lpass clocks

login
register
mail settings
Submitter Taniya Das
Date Dec. 5, 2018, 8:02 a.m.
Message ID <1543996920-17029-1-git-send-email-tdas@codeaurora.org>
Download mbox | patch
Permalink /patch/672613/
State New
Headers show

Comments

Taniya Das - Dec. 5, 2018, 8:02 a.m.
The GCC lpass clocks are updated as protected, so clean up the ifdefers.

Signed-off-by: Taniya Das <tdas@codeaurora.org>
---
 drivers/clk/qcom/gcc-sdm845.c | 5 -----
 1 file changed, 5 deletions(-)

--
Qualcomm INDIA, on behalf of Qualcomm Innovation Center, Inc.is a member
of the Code Aurora Forum, hosted by the  Linux Foundation.
Stephen Boyd - Dec. 5, 2018, 4 p.m.
Quoting Taniya Das (2018-12-05 00:02:00)
> The GCC lpass clocks are updated as protected, so clean up the ifdefers.
> 
> Signed-off-by: Taniya Das <tdas@codeaurora.org>
> ---

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?

Patch

diff --git a/drivers/clk/qcom/gcc-sdm845.c b/drivers/clk/qcom/gcc-sdm845.c
index c782e62..ba8ff99 100644
--- a/drivers/clk/qcom/gcc-sdm845.c
+++ b/drivers/clk/qcom/gcc-sdm845.c
@@ -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[] = {