Skip to content

Commit ae9b145

Browse files
committed
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
2 parents e7dd44f + 6e2acbf commit ae9b145

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/clk/meson/clk-pll.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,9 @@ static int meson_clk_pll_enable(struct clk_hw *hw)
367367
* 3. enable the lock detect module
368368
*/
369369
if (MESON_PARM_APPLICABLE(&pll->current_en)) {
370-
usleep_range(10, 20);
370+
udelay(10);
371371
meson_parm_write(clk->map, &pll->current_en, 1);
372-
usleep_range(40, 50);
372+
udelay(40);
373373
}
374374

375375
if (MESON_PARM_APPLICABLE(&pll->l_detect)) {

0 commit comments

Comments
 (0)