summaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2018-07-06 10:55:52 -0700
committerStephen Boyd <sboyd@kernel.org>2018-07-06 10:57:45 -0700
commit659e839c3c05950068ca4a78b6e5e9d48ecc14e2 (patch)
treed495293ce6b59eda4f87221eb64f75ebdc0e2429 /drivers/clk
parentedc6f7e9b11d4ab54f80890dedf58a914cae61e4 (diff)
parent7813c14c9475dbebcd7f41bd498426d01255acf9 (diff)
Merge tag 'meson-clk-fixes-4.18-1' of https://github.com/BayLibre/clk-meson into clk-fixes
Pull Amlogic clk driver fixes from Jerome Brunet: These are two simple fixes, yet the first one is quite important as it solves boots hangs we've been having when FDIV2 gets disabled. This did not show up before because this particular clock is heavily used and only gets disabled for a very short period of time before modules (such as ethernet or emmc) probe. - fix boot issue with gxbb and gxl platforms - fix racalculation error in the clk_audio_divider * tag 'meson-clk-fixes-4.18-1' of https://github.com/BayLibre/clk-meson: clk: meson: audio-divider is one based clk: meson-gxbb: set fclk_div2 as CLK_IS_CRITICAL
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/meson/clk-audio-divider.c2
-rw-r--r--drivers/clk/meson/gxbb.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/meson/clk-audio-divider.c b/drivers/clk/meson/clk-audio-divider.c
index 58f546e04807..e4cf96ba704e 100644
--- a/drivers/clk/meson/clk-audio-divider.c
+++ b/drivers/clk/meson/clk-audio-divider.c
@@ -51,7 +51,7 @@ static unsigned long audio_divider_recalc_rate(struct clk_hw *hw,
struct meson_clk_audio_div_data *adiv = meson_clk_audio_div_data(clk);
unsigned long divider;
- divider = meson_parm_read(clk->map, &adiv->div);
+ divider = meson_parm_read(clk->map, &adiv->div) + 1;
return DIV_ROUND_UP_ULL((u64)parent_rate, divider);
}
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index 240658404367..177fffb9ebef 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -498,6 +498,7 @@ static struct clk_regmap gxbb_fclk_div2 = {
.ops = &clk_regmap_gate_ops,
.parent_names = (const char *[]){ "fclk_div2_div" },
.num_parents = 1,
+ .flags = CLK_IS_CRITICAL,
},
};