summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2024-03-09 02:21:46 +0300
committerStephen Boyd <sboyd@kernel.org>2024-03-09 02:24:45 +0300
commit151c31ee79cd4d253eb3fc2959c2d461dcdd5767 (patch)
tree3a1c282e41320bf5764a2bedd523c513fae2a8bd
parent6613476e225e090cc9aad49be7fa504e290dd33d (diff)
parentba535bce57e71463a86f8b33a0ea88c26e3a6418 (diff)
downloadlinux-151c31ee79cd4d253eb3fc2959c2d461dcdd5767.tar.xz
Merge tag 'clk-meson-v6.9-1' of https://github.com/BayLibre/clk-meson into clk-amlogic
Pull Amlogic clk driver update from Jerome Brunet: - Fix clock listing Oops on Amlogic axg * tag 'clk-meson-v6.9-1' of https://github.com/BayLibre/clk-meson: clk: meson: Add missing clocks to axg_clk_regmaps
-rw-r--r--drivers/clk/meson/axg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index c12f81dfa674..5f60f2bcca59 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -2142,7 +2142,9 @@ static struct clk_regmap *const axg_clk_regmaps[] = {
&axg_vclk_input,
&axg_vclk2_input,
&axg_vclk_div,
+ &axg_vclk_div1,
&axg_vclk2_div,
+ &axg_vclk2_div1,
&axg_vclk_div2_en,
&axg_vclk_div4_en,
&axg_vclk_div6_en,