diff options
author | Neil Armstrong <narmstrong@baylibre.com> | 2019-09-19 05:36:25 -0400 |
---|---|---|
committer | Jerome Brunet <jbrunet@baylibre.com> | 2019-10-01 08:51:07 -0400 |
commit | 4a079643fc73247667000ba54fbccc2acadb04a5 (patch) | |
tree | 48a831877dc16fa714d4b8575a36c778e43a9217 | |
parent | 44b09b11b813b8550e6b976ea51593bc23bba8d1 (diff) |
clk: meson: g12a: fix cpu clock rate setting
CLK_SET_RATE_NO_REPARENT is wrongly set on the g12a cpu premux0 clocks
flags, and CLK_SET_RATE_PARENT is required for the g12a cpu premux0 clock
and the g12b cpub premux0 clock, otherwise CCF always selects the SYS_PLL
clock to feed the cpu cluster.
Fixes: ffae8475b90c ("clk: meson: g12a: add notifiers to handle cpu clock change")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-rw-r--r-- | drivers/clk/meson/g12a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c index ea4c791f106d..33c7e04b4a82 100644 --- a/drivers/clk/meson/g12a.c +++ b/drivers/clk/meson/g12a.c | |||
@@ -353,8 +353,7 @@ static struct clk_regmap g12a_cpu_clk_premux0 = { | |||
353 | { .hw = &g12a_fclk_div3.hw }, | 353 | { .hw = &g12a_fclk_div3.hw }, |
354 | }, | 354 | }, |
355 | .num_parents = 3, | 355 | .num_parents = 3, |
356 | /* This sub-tree is used a parking clock */ | 356 | .flags = CLK_SET_RATE_PARENT, |
357 | .flags = CLK_SET_RATE_NO_REPARENT, | ||
358 | }, | 357 | }, |
359 | }; | 358 | }; |
360 | 359 | ||
@@ -533,6 +532,7 @@ static struct clk_regmap g12b_cpub_clk_premux0 = { | |||
533 | { .hw = &g12a_fclk_div3.hw }, | 532 | { .hw = &g12a_fclk_div3.hw }, |
534 | }, | 533 | }, |
535 | .num_parents = 3, | 534 | .num_parents = 3, |
535 | .flags = CLK_SET_RATE_PARENT, | ||
536 | }, | 536 | }, |
537 | }; | 537 | }; |
538 | 538 | ||