clk: msm8996-gcc: add missing smmu clks
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Mon, 14 Aug 2017 10:26:34 +0000 (12:26 +0200)
committerStephen Boyd <sboyd@codeaurora.org>
Wed, 23 Aug 2017 23:07:18 +0000 (16:07 -0700)
This patch adds missing LPASS smmu clks which are required by the audio driver.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/qcom/gcc-msm8996.c
include/dt-bindings/clock/qcom,gcc-msm8996.h

index 8abc200d4fd36d7b6e87036c9ff6ec9aa908b4c8..7ddec886fcd35b05fed2d1a5e3920bcf302d4557 100644 (file)
@@ -2730,6 +2730,32 @@ static struct clk_fixed_factor ufs_rx_cfg_clk_src = {
        },
 };
 
+static struct clk_branch gcc_hlos1_vote_lpass_core_smmu_clk = {
+       .halt_reg = 0x7d010,
+       .halt_check = BRANCH_HALT_VOTED,
+       .clkr = {
+               .enable_reg = 0x7d010,
+               .enable_mask = BIT(0),
+               .hw.init = &(struct clk_init_data){
+                       .name = "hlos1_vote_lpass_core_smmu_clk",
+                       .ops = &clk_branch2_ops,
+               },
+       },
+};
+
+static struct clk_branch gcc_hlos1_vote_lpass_adsp_smmu_clk = {
+       .halt_reg = 0x7d014,
+       .halt_check = BRANCH_HALT_VOTED,
+       .clkr = {
+               .enable_reg = 0x7d014,
+               .enable_mask = BIT(0),
+               .hw.init = &(struct clk_init_data){
+                       .name = "hlos1_vote_lpass_adsp_smmu_clk",
+                       .ops = &clk_branch2_ops,
+               },
+       },
+};
+
 static struct clk_branch gcc_ufs_rx_cfg_clk = {
        .halt_reg = 0x75014,
        .clkr = {
@@ -3307,6 +3333,8 @@ static struct clk_regmap *gcc_msm8996_clocks[] = {
        [GCC_UFS_AHB_CLK] = &gcc_ufs_ahb_clk.clkr,
        [GCC_UFS_TX_CFG_CLK] = &gcc_ufs_tx_cfg_clk.clkr,
        [GCC_UFS_RX_CFG_CLK] = &gcc_ufs_rx_cfg_clk.clkr,
+       [GCC_HLOS1_VOTE_LPASS_CORE_SMMU_CLK] = &gcc_hlos1_vote_lpass_core_smmu_clk.clkr,
+       [GCC_HLOS1_VOTE_LPASS_ADSP_SMMU_CLK] = &gcc_hlos1_vote_lpass_adsp_smmu_clk.clkr,
        [GCC_UFS_TX_SYMBOL_0_CLK] = &gcc_ufs_tx_symbol_0_clk.clkr,
        [GCC_UFS_RX_SYMBOL_0_CLK] = &gcc_ufs_rx_symbol_0_clk.clkr,
        [GCC_UFS_RX_SYMBOL_1_CLK] = &gcc_ufs_rx_symbol_1_clk.clkr,
index 1f5c42254798e34ac6d6ea56a049f3e0a13dfc49..75b07cf5eed0f9a2941f0367af601b77c0bd1599 100644 (file)
 #define GCC_PCIE_CLKREF_CLK                                    216
 #define GCC_RX2_USB2_CLKREF_CLK                                        217
 #define GCC_RX1_USB2_CLKREF_CLK                                        218
+#define GCC_HLOS1_VOTE_LPASS_CORE_SMMU_CLK                     219
+#define GCC_HLOS1_VOTE_LPASS_ADSP_SMMU_CLK                     220
 
 #define GCC_SYSTEM_NOC_BCR                                     0
 #define GCC_CONFIG_NOC_BCR                                     1