Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
clk: qcom: gcc-msm8998: Move parent names and mapping below GPLLs
Prepare for a future patch where we use .hw pointers to these GPLL
clocks in the parent mapping instead of name references. This requires
the GPLL clocks to be decared before parent_data arrays.
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Link: https://lore.kernel.org/r/20210911121340.261920-2-marijn.suijten@somainline.org
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
authored by
Marijn Suijten
and committed by
Stephen Boyd
d6f1c681
17c774ab
+92
-92
+92
-92
drivers/clk/qcom/gcc-msm8998.c
+92
-92
drivers/clk/qcom/gcc-msm8998.c
···
25
25
#include "reset.h"
26
26
#include "gdsc.h"
27
27
28
-
enum {
29
-
P_AUD_REF_CLK,
30
-
P_CORE_BI_PLL_TEST_SE,
31
-
P_GPLL0_OUT_MAIN,
32
-
P_GPLL4_OUT_MAIN,
33
-
P_PLL0_EARLY_DIV_CLK_SRC,
34
-
P_SLEEP_CLK,
35
-
P_XO,
36
-
};
37
-
38
-
static const struct parent_map gcc_parent_map_0[] = {
39
-
{ P_XO, 0 },
40
-
{ P_GPLL0_OUT_MAIN, 1 },
41
-
{ P_PLL0_EARLY_DIV_CLK_SRC, 6 },
42
-
{ P_CORE_BI_PLL_TEST_SE, 7 },
43
-
};
44
-
45
-
static const char * const gcc_parent_names_0[] = {
46
-
"xo",
47
-
"gpll0_out_main",
48
-
"gpll0_out_main",
49
-
"core_bi_pll_test_se",
50
-
};
51
-
52
-
static const struct parent_map gcc_parent_map_1[] = {
53
-
{ P_XO, 0 },
54
-
{ P_GPLL0_OUT_MAIN, 1 },
55
-
{ P_CORE_BI_PLL_TEST_SE, 7 },
56
-
};
57
-
58
-
static const char * const gcc_parent_names_1[] = {
59
-
"xo",
60
-
"gpll0_out_main",
61
-
"core_bi_pll_test_se",
62
-
};
63
-
64
-
static const struct parent_map gcc_parent_map_2[] = {
65
-
{ P_XO, 0 },
66
-
{ P_GPLL0_OUT_MAIN, 1 },
67
-
{ P_SLEEP_CLK, 5 },
68
-
{ P_PLL0_EARLY_DIV_CLK_SRC, 6 },
69
-
{ P_CORE_BI_PLL_TEST_SE, 7 },
70
-
};
71
-
72
-
static const char * const gcc_parent_names_2[] = {
73
-
"xo",
74
-
"gpll0_out_main",
75
-
"core_pi_sleep_clk",
76
-
"gpll0_out_main",
77
-
"core_bi_pll_test_se",
78
-
};
79
-
80
-
static const struct parent_map gcc_parent_map_3[] = {
81
-
{ P_XO, 0 },
82
-
{ P_SLEEP_CLK, 5 },
83
-
{ P_CORE_BI_PLL_TEST_SE, 7 },
84
-
};
85
-
86
-
static const char * const gcc_parent_names_3[] = {
87
-
"xo",
88
-
"core_pi_sleep_clk",
89
-
"core_bi_pll_test_se",
90
-
};
91
-
92
-
static const struct parent_map gcc_parent_map_4[] = {
93
-
{ P_XO, 0 },
94
-
{ P_GPLL0_OUT_MAIN, 1 },
95
-
{ P_GPLL4_OUT_MAIN, 5 },
96
-
{ P_CORE_BI_PLL_TEST_SE, 7 },
97
-
};
98
-
99
-
static const char * const gcc_parent_names_4[] = {
100
-
"xo",
101
-
"gpll0_out_main",
102
-
"gpll4_out_main",
103
-
"core_bi_pll_test_se",
104
-
};
105
-
106
-
static const struct parent_map gcc_parent_map_5[] = {
107
-
{ P_XO, 0 },
108
-
{ P_GPLL0_OUT_MAIN, 1 },
109
-
{ P_AUD_REF_CLK, 2 },
110
-
{ P_CORE_BI_PLL_TEST_SE, 7 },
111
-
};
112
-
113
-
static const char * const gcc_parent_names_5[] = {
114
-
"xo",
115
-
"gpll0_out_main",
116
-
"aud_ref_clk",
117
-
"core_bi_pll_test_se",
118
-
};
119
-
120
28
static struct clk_fixed_factor xo = {
121
29
.mult = 1,
122
30
.div = 1,
···
344
436
.num_parents = 1,
345
437
.ops = &clk_alpha_pll_postdiv_fabia_ops,
346
438
},
439
+
};
440
+
441
+
enum {
442
+
P_AUD_REF_CLK,
443
+
P_CORE_BI_PLL_TEST_SE,
444
+
P_GPLL0_OUT_MAIN,
445
+
P_GPLL4_OUT_MAIN,
446
+
P_PLL0_EARLY_DIV_CLK_SRC,
447
+
P_SLEEP_CLK,
448
+
P_XO,
449
+
};
450
+
451
+
static const struct parent_map gcc_parent_map_0[] = {
452
+
{ P_XO, 0 },
453
+
{ P_GPLL0_OUT_MAIN, 1 },
454
+
{ P_PLL0_EARLY_DIV_CLK_SRC, 6 },
455
+
{ P_CORE_BI_PLL_TEST_SE, 7 },
456
+
};
457
+
458
+
static const char * const gcc_parent_names_0[] = {
459
+
"xo",
460
+
"gpll0_out_main",
461
+
"gpll0_out_main",
462
+
"core_bi_pll_test_se",
463
+
};
464
+
465
+
static const struct parent_map gcc_parent_map_1[] = {
466
+
{ P_XO, 0 },
467
+
{ P_GPLL0_OUT_MAIN, 1 },
468
+
{ P_CORE_BI_PLL_TEST_SE, 7 },
469
+
};
470
+
471
+
static const char * const gcc_parent_names_1[] = {
472
+
"xo",
473
+
"gpll0_out_main",
474
+
"core_bi_pll_test_se",
475
+
};
476
+
477
+
static const struct parent_map gcc_parent_map_2[] = {
478
+
{ P_XO, 0 },
479
+
{ P_GPLL0_OUT_MAIN, 1 },
480
+
{ P_SLEEP_CLK, 5 },
481
+
{ P_PLL0_EARLY_DIV_CLK_SRC, 6 },
482
+
{ P_CORE_BI_PLL_TEST_SE, 7 },
483
+
};
484
+
485
+
static const char * const gcc_parent_names_2[] = {
486
+
"xo",
487
+
"gpll0_out_main",
488
+
"core_pi_sleep_clk",
489
+
"gpll0_out_main",
490
+
"core_bi_pll_test_se",
491
+
};
492
+
493
+
static const struct parent_map gcc_parent_map_3[] = {
494
+
{ P_XO, 0 },
495
+
{ P_SLEEP_CLK, 5 },
496
+
{ P_CORE_BI_PLL_TEST_SE, 7 },
497
+
};
498
+
499
+
static const char * const gcc_parent_names_3[] = {
500
+
"xo",
501
+
"core_pi_sleep_clk",
502
+
"core_bi_pll_test_se",
503
+
};
504
+
505
+
static const struct parent_map gcc_parent_map_4[] = {
506
+
{ P_XO, 0 },
507
+
{ P_GPLL0_OUT_MAIN, 1 },
508
+
{ P_GPLL4_OUT_MAIN, 5 },
509
+
{ P_CORE_BI_PLL_TEST_SE, 7 },
510
+
};
511
+
512
+
static const char * const gcc_parent_names_4[] = {
513
+
"xo",
514
+
"gpll0_out_main",
515
+
"gpll4_out_main",
516
+
"core_bi_pll_test_se",
517
+
};
518
+
519
+
static const struct parent_map gcc_parent_map_5[] = {
520
+
{ P_XO, 0 },
521
+
{ P_GPLL0_OUT_MAIN, 1 },
522
+
{ P_AUD_REF_CLK, 2 },
523
+
{ P_CORE_BI_PLL_TEST_SE, 7 },
524
+
};
525
+
526
+
static const char * const gcc_parent_names_5[] = {
527
+
"xo",
528
+
"gpll0_out_main",
529
+
"aud_ref_clk",
530
+
"core_bi_pll_test_se",
347
531
};
348
532
349
533
static const struct freq_tbl ftbl_blsp1_qup1_i2c_apps_clk_src[] = {