Skip to content

Commit 9390860

Browse files
committed
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
2 parents e13dd04 + 35944dc commit 9390860

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1888,7 +1888,7 @@ L: [email protected]
18881888
S: Maintained
18891889
F: Documentation/devicetree/bindings/clock/amlogic*
18901890
F: drivers/clk/meson/
1891-
F: include/dt-bindings/clock/a1*
1891+
F: include/dt-bindings/clock/amlogic,a1*
18921892
F: include/dt-bindings/clock/gxbb*
18931893
F: include/dt-bindings/clock/meson*
18941894

drivers/clk/meson/clk-pll.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ static int meson_clk_pll_enable(struct clk_hw *hw)
370370
usleep_range(10, 20);
371371
meson_parm_write(clk->map, &pll->current_en, 1);
372372
usleep_range(40, 50);
373-
};
373+
}
374374

375375
if (MESON_PARM_APPLICABLE(&pll->l_detect)) {
376376
meson_parm_write(clk->map, &pll->l_detect, 1);

0 commit comments

Comments
 (0)