Re: [PATCH] clk: qcom: Add some missing gcc clks for msm8996

From: Stephen Boyd
Date: Tue Jun 19 2018 - 17:19:57 EST


Quoting Stephen Boyd (2018-05-15 11:05:44)
> Quoting Bjorn Andersson (2018-04-17 17:09:26)
> > @@ -3350,6 +3522,7 @@ static struct clk_regmap *gcc_msm8996_clocks[] = {
> > [GCC_AGGRE0_CNOC_AHB_CLK] = &gcc_aggre0_cnoc_ahb_clk.clkr,
> > [GCC_SMMU_AGGRE0_AXI_CLK] = &gcc_smmu_aggre0_axi_clk.clkr,
> > [GCC_SMMU_AGGRE0_AHB_CLK] = &gcc_smmu_aggre0_ahb_clk.clkr,
> > + [GCC_AGGRE1_PNOC_AHB_CLK] = &gcc_aggre1_pnoc_ahb_clk.clkr,
> > [GCC_AGGRE2_UFS_AXI_CLK] = &gcc_aggre2_ufs_axi_clk.clkr,
> > [GCC_AGGRE2_USB3_AXI_CLK] = &gcc_aggre2_usb3_axi_clk.clkr,
> > [GCC_QSPI_AHB_CLK] = &gcc_qspi_ahb_clk.clkr,
> > @@ -3360,6 +3533,19 @@ static struct clk_regmap *gcc_msm8996_clocks[] = {
> > [GCC_PCIE_CLKREF_CLK] = &gcc_pcie_clkref_clk.clkr,
> > [GCC_RX2_USB2_CLKREF_CLK] = &gcc_rx2_usb2_clkref_clk.clkr,
> > [GCC_RX1_USB2_CLKREF_CLK] = &gcc_rx1_usb2_clkref_clk.clkr,
> > + [GCC_HLOS1_VOTE_LPASS_CORE_SMMU_CLK] =
> > + &hlos1_vote_lpass_core_smmu_clk.clkr,
>
> drivers/clk/qcom/gcc-msm8996.c:3512:10: warning: Initializer entry defined twice
> drivers/clk/qcom/gcc-msm8996.c:3536:10: also defined here
>
> Resend please, or at least let me know what to do here. It looks like
> the one you sent has the parent chain setup properly so that the bus
> rcgs are in the chain of clks, while the one that is already there
> doesn't have the chain setup.

Reminder, this fell out as one of the patches I looked at merging for
v4.18 but didn't make the cut because of this confusion.