Skip to content

Commit

Permalink
Merge tag 'clk-meson-fixes-v6.5-1' of https://github.com/BayLibre/clk…
Browse files Browse the repository at this point in the history
…-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
  • Loading branch information
Stephen Boyd committed Jul 26, 2023
2 parents e7dd44f + 6e2acbf commit ae9b145
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/clk/meson/clk-pll.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,9 @@ static int meson_clk_pll_enable(struct clk_hw *hw)
* 3. enable the lock detect module
*/
if (MESON_PARM_APPLICABLE(&pll->current_en)) {
usleep_range(10, 20);
udelay(10);
meson_parm_write(clk->map, &pll->current_en, 1);
usleep_range(40, 50);
udelay(40);
}

if (MESON_PARM_APPLICABLE(&pll->l_detect)) {
Expand Down

0 comments on commit ae9b145

Please sign in to comment.