diff options
| author |   Stephen Boyd <sboyd@kernel.org> | 2023-06-16 11:34:36 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2023-06-16 11:34:36 -0700 |
| commit | 9390860900a304149d9da34bf7d09c19b7e984b7 (patch) | |
| tree | 719821bc58bd2dba69e56433ed53343bff315504 | |
| parent | clk: meson: a1: Staticize rtc clk (diff) | |
| parent | MAINTAINERS: repair pattern in ARM/Amlogic Meson SoC CLOCK FRAMEWORK (diff) | |
| download | linux-rng-9390860900a304149d9da34bf7d09c19b7e984b7.tar.xz linux-rng-9390860900a304149d9da34bf7d09c19b7e984b7.zip | |
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
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/clk/meson/clk-pll.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fa2a593175b4..a97cd90d2673 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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* diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index 56ec2210f1ad..8fef90bf962f 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c @@ -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); |