On 2021-12-15 03:54:16, Dmitry Baryshkov wrote:
> Move clock parent tables down, after the PLL declrataions, so that we
> can use pll hw clock fields in the next commit.
Looks like this "commit" (not the next one) already performs the
conversion (ie. there are "functional changes" in this patch).
I'm personally not opposed to that, but it should become clear from the
patch title and message.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
> drivers/clk/qcom/camcc-sdm845.c | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/clk/qcom/camcc-sdm845.c b/drivers/clk/qcom/camcc-sdm845.c
> index 545c288a7f98..f5b43dce3295 100644
> --- a/drivers/clk/qcom/camcc-sdm845.c
> +++ b/drivers/clk/qcom/camcc-sdm845.c
> @@ -25,22 +25,6 @@ enum {
> P_CAM_CC_PLL3_OUT_EVEN,
> };
>
> -static const struct parent_map cam_cc_parent_map_0[] = {
> - { P_BI_TCXO, 0 },
> - { P_CAM_CC_PLL2_OUT_EVEN, 1 },
> - { P_CAM_CC_PLL1_OUT_EVEN, 2 },
> - { P_CAM_CC_PLL3_OUT_EVEN, 5 },
> - { P_CAM_CC_PLL0_OUT_EVEN, 6 },
> -};
> -
> -static const char * const cam_cc_parent_names_0[] = {
> - "bi_tcxo",
> - "cam_cc_pll2_out_even",
> - "cam_cc_pll1_out_even",
> - "cam_cc_pll3_out_even",
> - "cam_cc_pll0_out_even",
> -};
> -
> static struct clk_alpha_pll cam_cc_pll0 = {
> .offset = 0x0,
> .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_FABIA],
> @@ -159,6 +143,22 @@ static struct clk_alpha_pll_postdiv cam_cc_pll3_out_even = {
> },
> };
>
> +static const struct parent_map cam_cc_parent_map_0[] = {
> + { P_BI_TCXO, 0 },
> + { P_CAM_CC_PLL2_OUT_EVEN, 1 },
> + { P_CAM_CC_PLL1_OUT_EVEN, 2 },
> + { P_CAM_CC_PLL3_OUT_EVEN, 5 },
> + { P_CAM_CC_PLL0_OUT_EVEN, 6 },
> +};
> +
> +static const struct clk_parent_data cam_cc_parent_data_0[] = {
> + { .fw_name = "bi_tcxo", .name = "bi_tcxo" },
> + { .hw = &cam_cc_pll2_out_even.clkr.hw },
> + { .hw = &cam_cc_pll1_out_even.clkr.hw },
> + { .hw = &cam_cc_pll3_out_even.clkr.hw },
> + { .hw = &cam_cc_pll0_out_even.clkr.hw },
> +};
> +
> static const struct freq_tbl ftbl_cam_cc_bps_clk_src[] = {
> F(19200000, P_BI_TCXO, 1, 0, 0),
> F(100000000, P_CAM_CC_PLL0_OUT_EVEN, 6, 0, 0),
> --
> 2.33.0
>
