diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2023-07-26 11:47:57 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2023-07-26 11:47:57 -0700 |
| commit | ae9b14582ad03abb3db66ba3f8dc5ca443ff54a1 (patch) | |
| tree | 0fd88557b597a138e1a8b91caeef9f6b47adabfc | |
| parent | e7dd44f4f3166db45248414f5df8f615392de47a (diff) | |
| parent | 6e2acbfe59b83043bc7ae1bb39fac4fc9dcd5a18 (diff) | |
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
| -rw-r--r-- | drivers/clk/meson/clk-pll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index 8fef90bf962f..6fa7639a3050 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c @@ -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)) { |