mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-05 12:16:29 -04:00
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:
@@ -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*
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user