Skip to content

Commit a61ca02

Browse files
bebarinobebarino
committed
clk: qcom: gcc-sdm660: Move parent tables after PLLs
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>
1 parent 72cfc73 commit a61ca02

1 file changed

Lines changed: 102 additions & 102 deletions

File tree

‎drivers/clk/qcom/gcc-sdm660.c‎

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -37,108 +37,6 @@ enum {
3737
P_GPLL1_EARLY_DIV,
3838
};
3939

40-
static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div[] = {
41-
{ P_XO, 0 },
42-
{ P_GPLL0, 1 },
43-
{ P_GPLL0_EARLY_DIV, 6 },
44-
};
45-
46-
static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div[] = {
47-
"xo",
48-
"gpll0",
49-
"gpll0_early_div",
50-
};
51-
52-
static const struct parent_map gcc_parent_map_xo_gpll0[] = {
53-
{ P_XO, 0 },
54-
{ P_GPLL0, 1 },
55-
};
56-
57-
static const char * const gcc_parent_names_xo_gpll0[] = {
58-
"xo",
59-
"gpll0",
60-
};
61-
62-
static const struct parent_map gcc_parent_map_xo_gpll0_sleep_clk_gpll0_early_div[] = {
63-
{ P_XO, 0 },
64-
{ P_GPLL0, 1 },
65-
{ P_SLEEP_CLK, 5 },
66-
{ P_GPLL0_EARLY_DIV, 6 },
67-
};
68-
69-
static const char * const gcc_parent_names_xo_gpll0_sleep_clk_gpll0_early_div[] = {
70-
"xo",
71-
"gpll0",
72-
"sleep_clk",
73-
"gpll0_early_div",
74-
};
75-
76-
static const struct parent_map gcc_parent_map_xo_sleep_clk[] = {
77-
{ P_XO, 0 },
78-
{ P_SLEEP_CLK, 5 },
79-
};
80-
81-
static const char * const gcc_parent_names_xo_sleep_clk[] = {
82-
"xo",
83-
"sleep_clk",
84-
};
85-
86-
static const struct parent_map gcc_parent_map_xo_gpll4[] = {
87-
{ P_XO, 0 },
88-
{ P_GPLL4, 5 },
89-
};
90-
91-
static const char * const gcc_parent_names_xo_gpll4[] = {
92-
"xo",
93-
"gpll4",
94-
};
95-
96-
static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div_gpll1_gpll4_gpll1_early_div[] = {
97-
{ P_XO, 0 },
98-
{ P_GPLL0, 1 },
99-
{ P_GPLL0_EARLY_DIV, 3 },
100-
{ P_GPLL1, 4 },
101-
{ P_GPLL4, 5 },
102-
{ P_GPLL1_EARLY_DIV, 6 },
103-
};
104-
105-
static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div_gpll1_gpll4_gpll1_early_div[] = {
106-
"xo",
107-
"gpll0",
108-
"gpll0_early_div",
109-
"gpll1",
110-
"gpll4",
111-
"gpll1_early_div",
112-
};
113-
114-
static const struct parent_map gcc_parent_map_xo_gpll0_gpll4_gpll0_early_div[] = {
115-
{ P_XO, 0 },
116-
{ P_GPLL0, 1 },
117-
{ P_GPLL4, 5 },
118-
{ P_GPLL0_EARLY_DIV, 6 },
119-
};
120-
121-
static const char * const gcc_parent_names_xo_gpll0_gpll4_gpll0_early_div[] = {
122-
"xo",
123-
"gpll0",
124-
"gpll4",
125-
"gpll0_early_div",
126-
};
127-
128-
static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div_gpll4[] = {
129-
{ P_XO, 0 },
130-
{ P_GPLL0, 1 },
131-
{ P_GPLL0_EARLY_DIV, 2 },
132-
{ P_GPLL4, 5 },
133-
};
134-
135-
static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div_gpll4[] = {
136-
"xo",
137-
"gpll0",
138-
"gpll0_early_div",
139-
"gpll4",
140-
};
141-
14240
static struct clk_fixed_factor xo = {
14341
.mult = 1,
14442
.div = 1,
@@ -251,6 +149,108 @@ static struct clk_alpha_pll_postdiv gpll4 = {
251149
},
252150
};
253151

152+
static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div[] = {
153+
{ P_XO, 0 },
154+
{ P_GPLL0, 1 },
155+
{ P_GPLL0_EARLY_DIV, 6 },
156+
};
157+
158+
static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div[] = {
159+
"xo",
160+
"gpll0",
161+
"gpll0_early_div",
162+
};
163+
164+
static const struct parent_map gcc_parent_map_xo_gpll0[] = {
165+
{ P_XO, 0 },
166+
{ P_GPLL0, 1 },
167+
};
168+
169+
static const char * const gcc_parent_names_xo_gpll0[] = {
170+
"xo",
171+
"gpll0",
172+
};
173+
174+
static const struct parent_map gcc_parent_map_xo_gpll0_sleep_clk_gpll0_early_div[] = {
175+
{ P_XO, 0 },
176+
{ P_GPLL0, 1 },
177+
{ P_SLEEP_CLK, 5 },
178+
{ P_GPLL0_EARLY_DIV, 6 },
179+
};
180+
181+
static const char * const gcc_parent_names_xo_gpll0_sleep_clk_gpll0_early_div[] = {
182+
"xo",
183+
"gpll0",
184+
"sleep_clk",
185+
"gpll0_early_div",
186+
};
187+
188+
static const struct parent_map gcc_parent_map_xo_sleep_clk[] = {
189+
{ P_XO, 0 },
190+
{ P_SLEEP_CLK, 5 },
191+
};
192+
193+
static const char * const gcc_parent_names_xo_sleep_clk[] = {
194+
"xo",
195+
"sleep_clk",
196+
};
197+
198+
static const struct parent_map gcc_parent_map_xo_gpll4[] = {
199+
{ P_XO, 0 },
200+
{ P_GPLL4, 5 },
201+
};
202+
203+
static const char * const gcc_parent_names_xo_gpll4[] = {
204+
"xo",
205+
"gpll4",
206+
};
207+
208+
static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div_gpll1_gpll4_gpll1_early_div[] = {
209+
{ P_XO, 0 },
210+
{ P_GPLL0, 1 },
211+
{ P_GPLL0_EARLY_DIV, 3 },
212+
{ P_GPLL1, 4 },
213+
{ P_GPLL4, 5 },
214+
{ P_GPLL1_EARLY_DIV, 6 },
215+
};
216+
217+
static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div_gpll1_gpll4_gpll1_early_div[] = {
218+
"xo",
219+
"gpll0",
220+
"gpll0_early_div",
221+
"gpll1",
222+
"gpll4",
223+
"gpll1_early_div",
224+
};
225+
226+
static const struct parent_map gcc_parent_map_xo_gpll0_gpll4_gpll0_early_div[] = {
227+
{ P_XO, 0 },
228+
{ P_GPLL0, 1 },
229+
{ P_GPLL4, 5 },
230+
{ P_GPLL0_EARLY_DIV, 6 },
231+
};
232+
233+
static const char * const gcc_parent_names_xo_gpll0_gpll4_gpll0_early_div[] = {
234+
"xo",
235+
"gpll0",
236+
"gpll4",
237+
"gpll0_early_div",
238+
};
239+
240+
static const struct parent_map gcc_parent_map_xo_gpll0_gpll0_early_div_gpll4[] = {
241+
{ P_XO, 0 },
242+
{ P_GPLL0, 1 },
243+
{ P_GPLL0_EARLY_DIV, 2 },
244+
{ P_GPLL4, 5 },
245+
};
246+
247+
static const char * const gcc_parent_names_xo_gpll0_gpll0_early_div_gpll4[] = {
248+
"xo",
249+
"gpll0",
250+
"gpll0_early_div",
251+
"gpll4",
252+
};
253+
254254
static const struct freq_tbl ftbl_blsp1_qup1_i2c_apps_clk_src[] = {
255255
F(19200000, P_XO, 1, 0, 0),
256256
F(50000000, P_GPLL0, 12, 0, 0),

0 commit comments

Comments
 (0)