Skip to content

Commit f3dc78e

Browse files
pelwellpopcornmix
authored andcommitted
clk: rp1: Reserve pll_audio* for clk_i2s
Prevent all clocks except clk_i2s from using the audio PLLs as sources, so that clk_i2s may be allowed to change them as needed. Signed-off-by: Phil Elwell <[email protected]>
1 parent 5deeea2 commit f3dc78e

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

drivers/clk/clk-rp1.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,7 +1744,7 @@ static const struct rp1_clk_desc clk_desc_array[] = {
17441744

17451745
[RP1_CLK_PWM0] = REGISTER_CLK(
17461746
.name = "clk_pwm0",
1747-
.parents = {"pll_audio_pri_ph",
1747+
.parents = {"", // "pll_audio_pri_ph",
17481748
"pll_video_sec",
17491749
"xosc",
17501750
"clksrc_gp0",
@@ -1766,7 +1766,7 @@ static const struct rp1_clk_desc clk_desc_array[] = {
17661766

17671767
[RP1_CLK_PWM1] = REGISTER_CLK(
17681768
.name = "clk_pwm1",
1769-
.parents = {"pll_audio_pri_ph",
1769+
.parents = {"", // "pll_audio_pri_ph",
17701770
"pll_video_sec",
17711771
"xosc",
17721772
"clksrc_gp0",
@@ -1788,9 +1788,9 @@ static const struct rp1_clk_desc clk_desc_array[] = {
17881788

17891789
[RP1_CLK_AUDIO_IN] = REGISTER_CLK(
17901790
.name = "clk_audio_in",
1791-
.parents = {"pll_audio",
1792-
"pll_audio_pri_ph",
1793-
"pll_audio_sec",
1791+
.parents = {"", //"pll_audio",
1792+
"", //"pll_audio_pri_ph",
1793+
"", //"pll_audio_sec",
17941794
"pll_video_sec",
17951795
"xosc",
17961796
"clksrc_gp0",
@@ -1811,8 +1811,8 @@ static const struct rp1_clk_desc clk_desc_array[] = {
18111811

18121812
[RP1_CLK_AUDIO_OUT] = REGISTER_CLK(
18131813
.name = "clk_audio_out",
1814-
.parents = {"pll_audio",
1815-
"pll_audio_sec",
1814+
.parents = {"", //"pll_audio",
1815+
"", //"pll_audio_sec",
18161816
"pll_video_sec",
18171817
"xosc",
18181818
"clksrc_gp0",
@@ -1902,7 +1902,7 @@ static const struct rp1_clk_desc clk_desc_array[] = {
19021902
[RP1_CLK_ADC] = REGISTER_CLK(
19031903
.name = "clk_adc",
19041904
.parents = {"xosc",
1905-
"pll_audio_tern",
1905+
"", //"pll_audio_tern",
19061906
"clksrc_gp0",
19071907
"clksrc_gp1",
19081908
"clksrc_gp2",
@@ -1954,7 +1954,7 @@ static const struct rp1_clk_desc clk_desc_array[] = {
19541954
"clksrc_gp4",
19551955
"clksrc_gp5",
19561956
"pll_sys",
1957-
"pll_audio",
1957+
"", //"pll_audio",
19581958
"",
19591959
"",
19601960
"clk_i2s",
@@ -1984,7 +1984,7 @@ static const struct rp1_clk_desc clk_desc_array[] = {
19841984
"clksrc_gp4",
19851985
"clksrc_gp5",
19861986
"pll_sys_pri_ph",
1987-
"pll_audio_pri_ph",
1987+
"", //"pll_audio_pri_ph",
19881988
"",
19891989
"",
19901990
"clk_adc",
@@ -2014,7 +2014,7 @@ static const struct rp1_clk_desc clk_desc_array[] = {
20142014
"clksrc_gp4",
20152015
"clksrc_gp5",
20162016
"pll_sys_sec",
2017-
"pll_audio_sec",
2017+
"", //"pll_audio_sec",
20182018
"pll_video",
20192019
"clk_audio_in",
20202020
"clk_dpi",
@@ -2073,7 +2073,7 @@ static const struct rp1_clk_desc clk_desc_array[] = {
20732073
"clksrc_gp2",
20742074
"clksrc_gp3",
20752075
"clksrc_gp5",
2076-
"pll_audio_tern",
2076+
"", //"pll_audio_tern",
20772077
"pll_video_sec",
20782078
"",
20792079
"",
@@ -2104,7 +2104,7 @@ static const struct rp1_clk_desc clk_desc_array[] = {
21042104
"clksrc_gp2",
21052105
"clksrc_gp3",
21062106
"clksrc_gp4",
2107-
"pll_audio_tern",
2107+
"", //"pll_audio_tern",
21082108
"pll_video_sec",
21092109
"clk_eth_tsu",
21102110
"",

0 commit comments

Comments
 (0)