Skip to content

Commit

Permalink
clk: qcom: gcc-sdm660: Move parent tables after PLLs
Browse files Browse the repository at this point in the history 
In the next patch we're going to change these tables to reference the
PLL structures directly. Let's move them here so the diff is easier to
read. No functional change in this patch.

Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  • Loading branch information
Stephen Boyd committed Aug 26, 2021
1 parent 72cfc73 commit a61ca02
Showing 1 changed file with 102 additions and 102 deletions.
204 changes: 102 additions & 102 deletions drivers/clk/qcom/gcc-sdm660.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,108 +37,6 @@ enum {
P_GPLL1_EARLY_DIV,
};

static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
{ P_GPLL0_EARLY_DIV, 6 },
};

static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div[] = {
"xo",
"gpll0",
"gpll0_early_div",
};

static const struct parent_map gcc_parent_map_xo_gpll0[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
};

static const char * const gcc_parent_names_xo_gpll0[] = {
"xo",
"gpll0",
};

static const struct parent_map gcc_parent_map_xo_gpll0_sleep_clk_gpll0_early_div[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
{ P_SLEEP_CLK, 5 },
{ P_GPLL0_EARLY_DIV, 6 },
};

static const char * const gcc_parent_names_xo_gpll0_sleep_clk_gpll0_early_div[] = {
"xo",
"gpll0",
"sleep_clk",
"gpll0_early_div",
};

static const struct parent_map gcc_parent_map_xo_sleep_clk[] = {
{ P_XO, 0 },
{ P_SLEEP_CLK, 5 },
};

static const char * const gcc_parent_names_xo_sleep_clk[] = {
"xo",
"sleep_clk",
};

static const struct parent_map gcc_parent_map_xo_gpll4[] = {
{ P_XO, 0 },
{ P_GPLL4, 5 },
};

static const char * const gcc_parent_names_xo_gpll4[] = {
"xo",
"gpll4",
};

static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div_gpll1_gpll4_gpll1_early_div[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
{ P_GPLL0_EARLY_DIV, 3 },
{ P_GPLL1, 4 },
{ P_GPLL4, 5 },
{ P_GPLL1_EARLY_DIV, 6 },
};

static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div_gpll1_gpll4_gpll1_early_div[] = {
"xo",
"gpll0",
"gpll0_early_div",
"gpll1",
"gpll4",
"gpll1_early_div",
};

static const struct parent_map gcc_parent_map_xo_gpll0_gpll4_gpll0_early_div[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
{ P_GPLL4, 5 },
{ P_GPLL0_EARLY_DIV, 6 },
};

static const char * const gcc_parent_names_xo_gpll0_gpll4_gpll0_early_div[] = {
"xo",
"gpll0",
"gpll4",
"gpll0_early_div",
};

static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div_gpll4[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
{ P_GPLL0_EARLY_DIV, 2 },
{ P_GPLL4, 5 },
};

static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div_gpll4[] = {
"xo",
"gpll0",
"gpll0_early_div",
"gpll4",
};

static struct clk_fixed_factor xo = {
.mult = 1,
.div = 1,
Expand Down Expand Up @@ -251,6 +149,108 @@ static struct clk_alpha_pll_postdiv gpll4 = {
},
};

static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
{ P_GPLL0_EARLY_DIV, 6 },
};

static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div[] = {
"xo",
"gpll0",
"gpll0_early_div",
};

static const struct parent_map gcc_parent_map_xo_gpll0[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
};

static const char * const gcc_parent_names_xo_gpll0[] = {
"xo",
"gpll0",
};

static const struct parent_map gcc_parent_map_xo_gpll0_sleep_clk_gpll0_early_div[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
{ P_SLEEP_CLK, 5 },
{ P_GPLL0_EARLY_DIV, 6 },
};

static const char * const gcc_parent_names_xo_gpll0_sleep_clk_gpll0_early_div[] = {
"xo",
"gpll0",
"sleep_clk",
"gpll0_early_div",
};

static const struct parent_map gcc_parent_map_xo_sleep_clk[] = {
{ P_XO, 0 },
{ P_SLEEP_CLK, 5 },
};

static const char * const gcc_parent_names_xo_sleep_clk[] = {
"xo",
"sleep_clk",
};

static const struct parent_map gcc_parent_map_xo_gpll4[] = {
{ P_XO, 0 },
{ P_GPLL4, 5 },
};

static const char * const gcc_parent_names_xo_gpll4[] = {
"xo",
"gpll4",
};

static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div_gpll1_gpll4_gpll1_early_div[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
{ P_GPLL0_EARLY_DIV, 3 },
{ P_GPLL1, 4 },
{ P_GPLL4, 5 },
{ P_GPLL1_EARLY_DIV, 6 },
};

static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div_gpll1_gpll4_gpll1_early_div[] = {
"xo",
"gpll0",
"gpll0_early_div",
"gpll1",
"gpll4",
"gpll1_early_div",
};

static const struct parent_map gcc_parent_map_xo_gpll0_gpll4_gpll0_early_div[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
{ P_GPLL4, 5 },
{ P_GPLL0_EARLY_DIV, 6 },
};

static const char * const gcc_parent_names_xo_gpll0_gpll4_gpll0_early_div[] = {
"xo",
"gpll0",
"gpll4",
"gpll0_early_div",
};

static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div_gpll4[] = {
{ P_XO, 0 },
{ P_GPLL0, 1 },
{ P_GPLL0_EARLY_DIV, 2 },
{ P_GPLL4, 5 },
};

static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div_gpll4[] = {
"xo",
"gpll0",
"gpll0_early_div",
"gpll4",
};

static const struct freq_tbl ftbl_blsp1_qup1_i2c_apps_clk_src[] = {
F(19200000, P_XO, 1, 0, 0),
F(50000000, P_GPLL0, 12, 0, 0),
Expand Down

0 comments on commit a61ca02

Please sign in to comment.