On 2021-12-08 20:54:28, Dmitry Baryshkov wrote:
> Move clock parent tables down, after the GPLL declrataions, so that we
> can use gpll hw clock fields in the next commit.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Reviewed-by: Marijn Suijten <marijn.suijten@xxxxxxxxxxxxxx>
> ---
> drivers/clk/qcom/gcc-msm8996.c | 184 ++++++++++++++++-----------------
> 1 file changed, 92 insertions(+), 92 deletions(-)
>
> diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c
> index 3acefe16355c..c2f9ae729d1e 100644
> --- a/drivers/clk/qcom/gcc-msm8996.c
> +++ b/drivers/clk/qcom/gcc-msm8996.c
> @@ -33,98 +33,6 @@ enum {
> P_AUD_REF_CLK,
> };
>
> -static const struct parent_map gcc_sleep_clk_map[] = {
> - { P_SLEEP_CLK, 5 }
> -};
> -
> -static const char * const gcc_sleep_clk[] = {
> - "sleep_clk"
> -};
> -
> -static const struct parent_map gcc_xo_gpll0_map[] = {
> - { P_XO, 0 },
> - { P_GPLL0, 1 }
> -};
> -
> -static const char * const gcc_xo_gpll0[] = {
> - "xo",
> - "gpll0"
> -};
> -
> -static const struct parent_map gcc_xo_sleep_clk_map[] = {
> - { P_XO, 0 },
> - { P_SLEEP_CLK, 5 }
> -};
> -
> -static const char * const gcc_xo_sleep_clk[] = {
> - "xo",
> - "sleep_clk"
> -};
> -
> -static const struct parent_map gcc_xo_gpll0_gpll0_early_div_map[] = {
> - { P_XO, 0 },
> - { P_GPLL0, 1 },
> - { P_GPLL0_EARLY_DIV, 6 }
> -};
> -
> -static const char * const gcc_xo_gpll0_gpll0_early_div[] = {
> - "xo",
> - "gpll0",
> - "gpll0_early_div"
> -};
> -
> -static const struct parent_map gcc_xo_gpll0_gpll4_map[] = {
> - { P_XO, 0 },
> - { P_GPLL0, 1 },
> - { P_GPLL4, 5 }
> -};
> -
> -static const char * const gcc_xo_gpll0_gpll4[] = {
> - "xo",
> - "gpll0",
> - "gpll4"
> -};
> -
> -static const struct parent_map gcc_xo_gpll0_aud_ref_clk_map[] = {
> - { P_XO, 0 },
> - { P_GPLL0, 1 },
> - { P_AUD_REF_CLK, 2 }
> -};
> -
> -static const char * const gcc_xo_gpll0_aud_ref_clk[] = {
> - "xo",
> - "gpll0",
> - "aud_ref_clk"
> -};
> -
> -static const struct parent_map gcc_xo_gpll0_sleep_clk_gpll0_early_div_map[] = {
> - { P_XO, 0 },
> - { P_GPLL0, 1 },
> - { P_SLEEP_CLK, 5 },
> - { P_GPLL0_EARLY_DIV, 6 }
> -};
> -
> -static const char * const gcc_xo_gpll0_sleep_clk_gpll0_early_div[] = {
> - "xo",
> - "gpll0",
> - "sleep_clk",
> - "gpll0_early_div"
> -};
> -
> -static const struct parent_map gcc_xo_gpll0_gpll4_gpll0_early_div_map[] = {
> - { P_XO, 0 },
> - { P_GPLL0, 1 },
> - { P_GPLL4, 5 },
> - { P_GPLL0_EARLY_DIV, 6 }
> -};
> -
> -static const char * const gcc_xo_gpll0_gpll4_gpll0_early_div[] = {
> - "xo",
> - "gpll0",
> - "gpll4",
> - "gpll0_early_div"
> -};
> -
> static struct clk_fixed_factor xo = {
> .mult = 1,
> .div = 1,
> @@ -229,6 +137,98 @@ static struct clk_alpha_pll_postdiv gpll4 = {
> },
> };
>
> +static const struct parent_map gcc_sleep_clk_map[] = {
> + { P_SLEEP_CLK, 5 }
> +};
> +
> +static const char * const gcc_sleep_clk[] = {
> + "sleep_clk"
> +};
> +
> +static const struct parent_map gcc_xo_gpll0_map[] = {
> + { P_XO, 0 },
> + { P_GPLL0, 1 }
> +};
> +
> +static const char * const gcc_xo_gpll0[] = {
> + "xo",
> + "gpll0"
> +};
> +
> +static const struct parent_map gcc_xo_sleep_clk_map[] = {
> + { P_XO, 0 },
> + { P_SLEEP_CLK, 5 }
> +};
> +
> +static const char * const gcc_xo_sleep_clk[] = {
> + "xo",
> + "sleep_clk"
> +};
> +
> +static const struct parent_map gcc_xo_gpll0_gpll0_early_div_map[] = {
> + { P_XO, 0 },
> + { P_GPLL0, 1 },
> + { P_GPLL0_EARLY_DIV, 6 }
> +};
> +
> +static const char * const gcc_xo_gpll0_gpll0_early_div[] = {
> + "xo",
> + "gpll0",
> + "gpll0_early_div"
> +};
> +
> +static const struct parent_map gcc_xo_gpll0_gpll4_map[] = {
> + { P_XO, 0 },
> + { P_GPLL0, 1 },
> + { P_GPLL4, 5 }
> +};
> +
> +static const char * const gcc_xo_gpll0_gpll4[] = {
> + "xo",
> + "gpll0",
> + "gpll4"
> +};
> +
> +static const struct parent_map gcc_xo_gpll0_aud_ref_clk_map[] = {
> + { P_XO, 0 },
> + { P_GPLL0, 1 },
> + { P_AUD_REF_CLK, 2 }
> +};
> +
> +static const char * const gcc_xo_gpll0_aud_ref_clk[] = {
> + "xo",
> + "gpll0",
> + "aud_ref_clk"
> +};
> +
> +static const struct parent_map gcc_xo_gpll0_sleep_clk_gpll0_early_div_map[] = {
> + { P_XO, 0 },
> + { P_GPLL0, 1 },
> + { P_SLEEP_CLK, 5 },
> + { P_GPLL0_EARLY_DIV, 6 }
> +};
> +
> +static const char * const gcc_xo_gpll0_sleep_clk_gpll0_early_div[] = {
> + "xo",
> + "gpll0",
> + "sleep_clk",
> + "gpll0_early_div"
> +};
> +
> +static const struct parent_map gcc_xo_gpll0_gpll4_gpll0_early_div_map[] = {
> + { P_XO, 0 },
> + { P_GPLL0, 1 },
> + { P_GPLL4, 5 },
> + { P_GPLL0_EARLY_DIV, 6 }
> +};
> +
> +static const char * const gcc_xo_gpll0_gpll4_gpll0_early_div[] = {
> + "xo",
> + "gpll0",
> + "gpll4",
> + "gpll0_early_div"
> +};
> +
> static const struct freq_tbl ftbl_system_noc_clk_src[] = {
> F(19200000, P_XO, 1, 0, 0),
> F(50000000, P_GPLL0_EARLY_DIV, 6, 0, 0),
> --
> 2.33.0
>
