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

Pull more Amlogic clk driver updates from Jerome Brunet:

 - Fix maintainers file pattern mistake
 - Remove unneeded semicolon

* tag 'clk-meson-v6.5-2' of https://github.com/BayLibre/clk-meson:
  MAINTAINERS: repair pattern in ARM/Amlogic Meson SoC CLOCK FRAMEWORK
  clk: meson: pll: remove unneeded semicolon
This commit is contained in:
Stephen Boyd
2023-06-16 11:34:36 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1888,7 +1888,7 @@ L: linux-amlogic@lists.infradead.org
S: Maintained
F: Documentation/devicetree/bindings/clock/amlogic*
F: drivers/clk/meson/
F: include/dt-bindings/clock/a1*
F: include/dt-bindings/clock/amlogic,a1*
F: include/dt-bindings/clock/gxbb*
F: include/dt-bindings/clock/meson*

View File

@@ -370,7 +370,7 @@ static int meson_clk_pll_enable(struct clk_hw *hw)
usleep_range(10, 20);
meson_parm_write(clk->map, &pll->current_en, 1);
usleep_range(40, 50);
};
}
if (MESON_PARM_APPLICABLE(&pll->l_detect)) {
meson_parm_write(clk->map, &pll->l_detect, 1);