Skip to content

Commit fac3810

Browse files
committed
Merge tag 'clk-meson-v5.5-1' of https://github.com/BayLibre/clk-meson into clk-amlogic
Pull Amlogic clk updates from Jerome Brunet: - Add sm1 support in the Amlogic audio clock controller * tag 'clk-meson-v5.5-1' of https://github.com/BayLibre/clk-meson: clk: meson: axg-audio: use devm_platform_ioremap_resource() to simplify code clk: meson: axg_audio: add sm1 support clk: meson: axg-audio: provide clk top signal name clk: meson: axg-audio: prepare sm1 addition clk: meson: axg-audio: fix regmap last register clk: meson: axg-audio: remove useless defines dt-bindings: clock: meson: add sm1 resets to the axg-audio controller dt-bindings: clk: axg-audio: add sm1 bindings clk: meson: g12a: set CLK_MUX_ROUND_CLOSEST on the cpu clock muxes clk: meson: g12a: fix cpu clock rate setting clk: meson: gxbb: let sar_adc_clk_div set the parent clock rate
2 parents 54ecb8f + 50bf025 commit fac3810

File tree

7 files changed

+1386
-702
lines changed

7 files changed

+1386
-702
lines changed

Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ devices.
77
Required Properties:
88

99
- compatible : should be "amlogic,axg-audio-clkc" for the A113X and A113D,
10-
"amlogic,g12a-audio-clkc" for G12A.
10+
"amlogic,g12a-audio-clkc" for G12A,
11+
"amlogic,sm1-audio-clkc" for S905X3.
1112
- reg : physical base address of the clock controller and length of
1213
memory mapped region.
1314
- clocks : a list of phandle + clock-specifier pairs for the clocks listed

0 commit comments

Comments
 (0)