Skip to content

Commit dd4254b

Browse files
committed
clk: rp1: Correct declarations of divider parents
PLL dividers are registered using the clk_hw in the clk_divider member of rp1_clk_desc, rather than the direct clk_hw member. In order for parent location to work, parent declarations must link to &<clock>.div.hw, not &<clock>.hw. Signed-off-by: Phil Elwell <[email protected]>
1 parent 5e5a8b5 commit dd4254b

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

drivers/clk/clk-rp1.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,7 +1429,7 @@ static struct rp1_clk_desc pll_video_sec_desc = REGISTER_PLL_DIV(
14291429

14301430
static const struct clk_parent_data clk_eth_tsu_parents[] = {
14311431
{ .index = 0 },
1432-
{ .hw = &pll_video_sec_desc.hw },
1432+
{ .hw = &pll_video_sec_desc.div.hw },
14331433
{ .index = -1 },
14341434
{ .index = -1 },
14351435
{ .index = -1 },
@@ -1460,7 +1460,7 @@ static struct rp1_clk_desc clk_eth_tsu_desc = REGISTER_CLK(
14601460
static const struct clk_parent_data clk_eth_parents[] = {
14611461
{ .hw = &pll_sys_sec_desc.div.hw },
14621462
{ .hw = &pll_sys_desc.hw },
1463-
{ .hw = &pll_video_sec_desc.hw },
1463+
{ .hw = &pll_video_sec_desc.div.hw },
14641464
};
14651465

14661466
static struct rp1_clk_desc clk_eth_desc = REGISTER_CLK(
@@ -1661,7 +1661,7 @@ static struct rp1_clk_desc clk_uart_desc = REGISTER_CLK(
16611661

16621662
static const struct clk_parent_data clk_pwm0_parents[] = {
16631663
{ .index = -1 },
1664-
{ .hw = &pll_video_sec_desc.hw },
1664+
{ .hw = &pll_video_sec_desc.div.hw },
16651665
{ .index = 0 },
16661666
};
16671667

@@ -1687,7 +1687,7 @@ static struct rp1_clk_desc clk_pwm0_desc = REGISTER_CLK(
16871687

16881688
static const struct clk_parent_data clk_pwm1_parents[] = {
16891689
{ .index = -1 },
1690-
{ .hw = &pll_video_sec_desc.hw },
1690+
{ .hw = &pll_video_sec_desc.div.hw },
16911691
{ .index = 0 },
16921692
};
16931693

@@ -1715,7 +1715,7 @@ static const struct clk_parent_data clk_audio_in_parents[] = {
17151715
{ .index = -1 },
17161716
{ .index = -1 },
17171717
{ .index = -1 },
1718-
{ .hw = &pll_video_sec_desc.hw },
1718+
{ .hw = &pll_video_sec_desc.div.hw },
17191719
{ .index = 0 },
17201720
};
17211721

@@ -1740,8 +1740,8 @@ static struct rp1_clk_desc clk_audio_in_desc = REGISTER_CLK(
17401740

17411741
static const struct clk_parent_data clk_audio_out_parents[] = {
17421742
{ .index = -1 },
1743-
{ .hw = &pll_audio_sec_desc.hw },
1744-
{ .hw = &pll_video_sec_desc.hw },
1743+
{ .hw = &pll_audio_sec_desc.div.hw },
1744+
{ .hw = &pll_video_sec_desc.div.hw },
17451745
{ .index = 0 },
17461746
};
17471747

@@ -1767,7 +1767,7 @@ static struct rp1_clk_desc clk_audio_out_desc = REGISTER_CLK(
17671767
static const struct clk_parent_data clk_i2s_parents[] = {
17681768
{ .index = 0 },
17691769
{ .hw = &pll_audio_desc.hw },
1770-
{ .hw = &pll_audio_sec_desc.hw },
1770+
{ .hw = &pll_audio_sec_desc.div.hw },
17711771
};
17721772

17731773
static struct rp1_clk_desc clk_i2s_desc = REGISTER_CLK(
@@ -1889,7 +1889,7 @@ static struct rp1_clk_desc clk_sdio_alt_src_desc = REGISTER_CLK(
18891889

18901890
static const struct clk_parent_data clk_dpi_parents[] = {
18911891
{ .hw = &pll_sys_desc.hw },
1892-
{ .hw = &pll_video_sec_desc.hw },
1892+
{ .hw = &pll_video_sec_desc.div.hw },
18931893
{ .hw = &pll_video_desc.hw },
18941894
{ .index = -1 },
18951895
{ .index = -1 },
@@ -2025,7 +2025,7 @@ static struct rp1_clk_desc clksrc_mipi1_dsi_byteclk_desc = REGISTER_CLK(
20252025

20262026
static const struct clk_parent_data clk_mipi0_dpi_parents[] = {
20272027
{ .hw = &pll_sys_desc.hw },
2028-
{ .hw = &pll_video_sec_desc.hw },
2028+
{ .hw = &pll_video_sec_desc.div.hw },
20292029
{ .hw = &pll_video_desc.hw },
20302030
{ .hw = &clksrc_mipi0_dsi_byteclk_desc.hw },
20312031
{ .index = -1 },
@@ -2056,7 +2056,7 @@ static struct rp1_clk_desc clk_mipi0_dpi_desc = REGISTER_CLK(
20562056

20572057
static const struct clk_parent_data clk_mipi1_dpi_parents[] = {
20582058
{ .hw = &pll_sys_desc.hw },
2059-
{ .hw = &pll_video_sec_desc.hw },
2059+
{ .hw = &pll_video_sec_desc.div.hw },
20602060
{ .hw = &pll_video_desc.hw },
20612061
{ .hw = &clksrc_mipi1_dsi_byteclk_desc.hw },
20622062
{ .index = -1 },
@@ -2092,7 +2092,7 @@ static const struct clk_parent_data clk_gp2_parents[] = {
20922092
{ .index = -1 },
20932093
{ .index = -1 },
20942094
{ .index = -1 },
2095-
{ .hw = &pll_sys_sec_desc.hw },
2095+
{ .hw = &pll_sys_sec_desc.div.hw },
20962096
{ .index = -1 },
20972097
{ .hw = &pll_video_desc.hw },
20982098
{ .hw = &clk_audio_in_desc.hw },
@@ -2173,7 +2173,7 @@ static const struct clk_parent_data clk_gp4_parents[] = {
21732173
{ .index = -1 },
21742174
{ .index = -1 },
21752175
{ .index = -1 },
2176-
{ .hw = &pll_video_sec_desc.hw },
2176+
{ .hw = &pll_video_sec_desc.div.hw },
21772177
{ .index = -1 },
21782178
{ .index = -1 },
21792179
{ .index = -1 },
@@ -2207,7 +2207,7 @@ static struct rp1_clk_desc clk_gp4_desc = REGISTER_CLK(
22072207

22082208
static const struct clk_parent_data clk_vec_parents[] = {
22092209
{ .hw = &pll_sys_pri_ph_desc.hw },
2210-
{ .hw = &pll_video_sec_desc.hw },
2210+
{ .hw = &pll_video_sec_desc.div.hw },
22112211
{ .hw = &pll_video_desc.hw },
22122212
{ .index = -1 },
22132213
{ .index = -1 },
@@ -2243,7 +2243,7 @@ static const struct clk_parent_data clk_gp5_parents[] = {
22432243
{ .index = -1 },
22442244
{ .index = -1 },
22452245
{ .index = -1 },
2246-
{ .hw = &pll_video_sec_desc.hw },
2246+
{ .hw = &pll_video_sec_desc.div.hw },
22472247
{ .hw = &clk_eth_tsu_desc.hw },
22482248
{ .index = -1 },
22492249
{ .hw = &clk_vec_desc.hw },

0 commit comments

Comments
 (0)