Commit ae9b1458 authored by Stephen Boyd's avatar Stephen Boyd

Merge tag 'clk-meson-fixes-v6.5-1' of https://github.com/BayLibre/clk-meson into clk-fixes

Pull an Amlogic clk driver fix from Jerome Brunet:

 - Fix PLL scheduling while atomic following a1 locking sequence update

* tag 'clk-meson-fixes-v6.5-1' of https://github.com/BayLibre/clk-meson:
  clk: meson: change usleep_range() to udelay() for atomic context
parents e7dd44f4 6e2acbfe
...@@ -367,9 +367,9 @@ static int meson_clk_pll_enable(struct clk_hw *hw) ...@@ -367,9 +367,9 @@ static int meson_clk_pll_enable(struct clk_hw *hw)
* 3. enable the lock detect module * 3. enable the lock detect module
*/ */
if (MESON_PARM_APPLICABLE(&pll->current_en)) { if (MESON_PARM_APPLICABLE(&pll->current_en)) {
usleep_range(10, 20); udelay(10);
meson_parm_write(clk->map, &pll->current_en, 1); meson_parm_write(clk->map, &pll->current_en, 1);
usleep_range(40, 50); udelay(40);
} }
if (MESON_PARM_APPLICABLE(&pll->l_detect)) { if (MESON_PARM_APPLICABLE(&pll->l_detect)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment