Skip to content

Commit 543711d

Browse files
committed
ice: use designated initializers for TSPLL consts
JIRA: https://issues.redhat.com/browse/RHEL-104246 Upstream commit(s): commit b3b26c9 Author: Karol Kolacinski <karol.kolacinski@intel.com> Date: Thu May 1 15:54:16 2025 -0700 ice: use designated initializers for TSPLL consts Instead of multiple comments, use designated initializers for TSPLL consts. Adjust ice_tspll_params_e82x fields sizes. Reviewed-by: Michal Kubiak <michal.kubiak@intel.com> Reviewed-by: Milena Olech <milena.olech@intel.com> Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com> Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Signed-off-by: Petr Oros <poros@redhat.com>
1 parent 712a46f commit 543711d

File tree

2 files changed

+34
-69
lines changed

2 files changed

+34
-69
lines changed

drivers/net/ethernet/intel/ice/ice_tspll.c

Lines changed: 30 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -7,76 +7,41 @@
77

88
static const struct
99
ice_tspll_params_e82x e82x_tspll_params[NUM_ICE_TSPLL_FREQ] = {
10-
/* ICE_TSPLL_FREQ_25_000 -> 25 MHz */
11-
{
12-
/* refclk_pre_div */
13-
1,
14-
/* feedback_div */
15-
197,
16-
/* frac_n_div */
17-
2621440,
18-
/* post_pll_div */
19-
6,
10+
[ICE_TSPLL_FREQ_25_000] = {
11+
.refclk_pre_div = 1,
12+
.post_pll_div = 6,
13+
.feedback_div = 197,
14+
.frac_n_div = 2621440,
2015
},
21-
22-
/* ICE_TSPLL_FREQ_122_880 -> 122.88 MHz */
23-
{
24-
/* refclk_pre_div */
25-
5,
26-
/* feedback_div */
27-
223,
28-
/* frac_n_div */
29-
524288,
30-
/* post_pll_div */
31-
7,
16+
[ICE_TSPLL_FREQ_122_880] = {
17+
.refclk_pre_div = 5,
18+
.post_pll_div = 7,
19+
.feedback_div = 223,
20+
.frac_n_div = 524288
3221
},
33-
34-
/* ICE_TSPLL_FREQ_125_000 -> 125 MHz */
35-
{
36-
/* refclk_pre_div */
37-
5,
38-
/* feedback_div */
39-
223,
40-
/* frac_n_div */
41-
524288,
42-
/* post_pll_div */
43-
7,
22+
[ICE_TSPLL_FREQ_125_000] = {
23+
.refclk_pre_div = 5,
24+
.post_pll_div = 7,
25+
.feedback_div = 223,
26+
.frac_n_div = 524288
4427
},
45-
46-
/* ICE_TSPLL_FREQ_153_600 -> 153.6 MHz */
47-
{
48-
/* refclk_pre_div */
49-
5,
50-
/* feedback_div */
51-
159,
52-
/* frac_n_div */
53-
1572864,
54-
/* post_pll_div */
55-
6,
28+
[ICE_TSPLL_FREQ_153_600] = {
29+
.refclk_pre_div = 5,
30+
.post_pll_div = 6,
31+
.feedback_div = 159,
32+
.frac_n_div = 1572864
5633
},
57-
58-
/* ICE_TSPLL_FREQ_156_250 -> 156.25 MHz */
59-
{
60-
/* refclk_pre_div */
61-
5,
62-
/* feedback_div */
63-
159,
64-
/* frac_n_div */
65-
1572864,
66-
/* post_pll_div */
67-
6,
34+
[ICE_TSPLL_FREQ_156_250] = {
35+
.refclk_pre_div = 5,
36+
.post_pll_div = 6,
37+
.feedback_div = 159,
38+
.frac_n_div = 1572864
6839
},
69-
70-
/* ICE_TSPLL_FREQ_245_760 -> 245.76 MHz */
71-
{
72-
/* refclk_pre_div */
73-
10,
74-
/* feedback_div */
75-
223,
76-
/* frac_n_div */
77-
524288,
78-
/* post_pll_div */
79-
7,
40+
[ICE_TSPLL_FREQ_245_760] = {
41+
.refclk_pre_div = 10,
42+
.post_pll_div = 7,
43+
.feedback_div = 223,
44+
.frac_n_div = 524288
8045
},
8146
};
8247

drivers/net/ethernet/intel/ice/ice_tspll.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
/**
88
* struct ice_tspll_params_e82x - E82X TSPLL parameters
99
* @refclk_pre_div: Reference clock pre-divisor
10+
* @post_pll_div: Post PLL divisor
1011
* @feedback_div: Feedback divisor
1112
* @frac_n_div: Fractional divisor
12-
* @post_pll_div: Post PLL divisor
1313
*
1414
* Clock Generation Unit parameters used to program the PLL based on the
1515
* selected TIME_REF/TCXO frequency.
1616
*/
1717
struct ice_tspll_params_e82x {
18-
u32 refclk_pre_div;
19-
u32 feedback_div;
18+
u8 refclk_pre_div;
19+
u8 post_pll_div;
20+
u8 feedback_div;
2021
u32 frac_n_div;
21-
u32 post_pll_div;
2222
};
2323

2424
#define ICE_TSPLL_CK_REFCLKFREQ_E825 0x1F

0 commit comments

Comments
 (0)