Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

clk: qcom: gcc-msm8996: move clock parent tables down

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@linaro.org>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211228045415.20543-15-dmitry.baryshkov@linaro.org

authored by

Dmitry Baryshkov and committed by
Bjorn Andersson
1a2789cf b554a687

+92 -92
+92 -92
drivers/clk/qcom/gcc-msm8996.c
··· 33 33 P_AUD_REF_CLK, 34 34 }; 35 35 36 - static const struct parent_map gcc_sleep_clk_map[] = { 37 - { P_SLEEP_CLK, 5 } 38 - }; 39 - 40 - static const char * const gcc_sleep_clk[] = { 41 - "sleep_clk" 42 - }; 43 - 44 - static const struct parent_map gcc_xo_gpll0_map[] = { 45 - { P_XO, 0 }, 46 - { P_GPLL0, 1 } 47 - }; 48 - 49 - static const char * const gcc_xo_gpll0[] = { 50 - "xo", 51 - "gpll0" 52 - }; 53 - 54 - static const struct parent_map gcc_xo_sleep_clk_map[] = { 55 - { P_XO, 0 }, 56 - { P_SLEEP_CLK, 5 } 57 - }; 58 - 59 - static const char * const gcc_xo_sleep_clk[] = { 60 - "xo", 61 - "sleep_clk" 62 - }; 63 - 64 - static const struct parent_map gcc_xo_gpll0_gpll0_early_div_map[] = { 65 - { P_XO, 0 }, 66 - { P_GPLL0, 1 }, 67 - { P_GPLL0_EARLY_DIV, 6 } 68 - }; 69 - 70 - static const char * const gcc_xo_gpll0_gpll0_early_div[] = { 71 - "xo", 72 - "gpll0", 73 - "gpll0_early_div" 74 - }; 75 - 76 - static const struct parent_map gcc_xo_gpll0_gpll4_map[] = { 77 - { P_XO, 0 }, 78 - { P_GPLL0, 1 }, 79 - { P_GPLL4, 5 } 80 - }; 81 - 82 - static const char * const gcc_xo_gpll0_gpll4[] = { 83 - "xo", 84 - "gpll0", 85 - "gpll4" 86 - }; 87 - 88 - static const struct parent_map gcc_xo_gpll0_aud_ref_clk_map[] = { 89 - { P_XO, 0 }, 90 - { P_GPLL0, 1 }, 91 - { P_AUD_REF_CLK, 2 } 92 - }; 93 - 94 - static const char * const gcc_xo_gpll0_aud_ref_clk[] = { 95 - "xo", 96 - "gpll0", 97 - "aud_ref_clk" 98 - }; 99 - 100 - static const struct parent_map gcc_xo_gpll0_sleep_clk_gpll0_early_div_map[] = { 101 - { P_XO, 0 }, 102 - { P_GPLL0, 1 }, 103 - { P_SLEEP_CLK, 5 }, 104 - { P_GPLL0_EARLY_DIV, 6 } 105 - }; 106 - 107 - static const char * const gcc_xo_gpll0_sleep_clk_gpll0_early_div[] = { 108 - "xo", 109 - "gpll0", 110 - "sleep_clk", 111 - "gpll0_early_div" 112 - }; 113 - 114 - static const struct parent_map gcc_xo_gpll0_gpll4_gpll0_early_div_map[] = { 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_xo_gpll0_gpll4_gpll0_early_div[] = { 122 - "xo", 123 - "gpll0", 124 - "gpll4", 125 - "gpll0_early_div" 126 - }; 127 - 128 36 static struct clk_fixed_factor xo = { 129 37 .mult = 1, 130 38 .div = 1, ··· 135 227 .num_parents = 1, 136 228 .ops = &clk_alpha_pll_postdiv_ops, 137 229 }, 230 + }; 231 + 232 + static const struct parent_map gcc_sleep_clk_map[] = { 233 + { P_SLEEP_CLK, 5 } 234 + }; 235 + 236 + static const char * const gcc_sleep_clk[] = { 237 + "sleep_clk" 238 + }; 239 + 240 + static const struct parent_map gcc_xo_gpll0_map[] = { 241 + { P_XO, 0 }, 242 + { P_GPLL0, 1 } 243 + }; 244 + 245 + static const char * const gcc_xo_gpll0[] = { 246 + "xo", 247 + "gpll0" 248 + }; 249 + 250 + static const struct parent_map gcc_xo_sleep_clk_map[] = { 251 + { P_XO, 0 }, 252 + { P_SLEEP_CLK, 5 } 253 + }; 254 + 255 + static const char * const gcc_xo_sleep_clk[] = { 256 + "xo", 257 + "sleep_clk" 258 + }; 259 + 260 + static const struct parent_map gcc_xo_gpll0_gpll0_early_div_map[] = { 261 + { P_XO, 0 }, 262 + { P_GPLL0, 1 }, 263 + { P_GPLL0_EARLY_DIV, 6 } 264 + }; 265 + 266 + static const char * const gcc_xo_gpll0_gpll0_early_div[] = { 267 + "xo", 268 + "gpll0", 269 + "gpll0_early_div" 270 + }; 271 + 272 + static const struct parent_map gcc_xo_gpll0_gpll4_map[] = { 273 + { P_XO, 0 }, 274 + { P_GPLL0, 1 }, 275 + { P_GPLL4, 5 } 276 + }; 277 + 278 + static const char * const gcc_xo_gpll0_gpll4[] = { 279 + "xo", 280 + "gpll0", 281 + "gpll4" 282 + }; 283 + 284 + static const struct parent_map gcc_xo_gpll0_aud_ref_clk_map[] = { 285 + { P_XO, 0 }, 286 + { P_GPLL0, 1 }, 287 + { P_AUD_REF_CLK, 2 } 288 + }; 289 + 290 + static const char * const gcc_xo_gpll0_aud_ref_clk[] = { 291 + "xo", 292 + "gpll0", 293 + "aud_ref_clk" 294 + }; 295 + 296 + static const struct parent_map gcc_xo_gpll0_sleep_clk_gpll0_early_div_map[] = { 297 + { P_XO, 0 }, 298 + { P_GPLL0, 1 }, 299 + { P_SLEEP_CLK, 5 }, 300 + { P_GPLL0_EARLY_DIV, 6 } 301 + }; 302 + 303 + static const char * const gcc_xo_gpll0_sleep_clk_gpll0_early_div[] = { 304 + "xo", 305 + "gpll0", 306 + "sleep_clk", 307 + "gpll0_early_div" 308 + }; 309 + 310 + static const struct parent_map gcc_xo_gpll0_gpll4_gpll0_early_div_map[] = { 311 + { P_XO, 0 }, 312 + { P_GPLL0, 1 }, 313 + { P_GPLL4, 5 }, 314 + { P_GPLL0_EARLY_DIV, 6 } 315 + }; 316 + 317 + static const char * const gcc_xo_gpll0_gpll4_gpll0_early_div[] = { 318 + "xo", 319 + "gpll0", 320 + "gpll4", 321 + "gpll0_early_div" 138 322 }; 139 323 140 324 static const struct freq_tbl ftbl_system_noc_clk_src[] = {