Merge tag 'meson-clk-5.2-2' of https://github.com/BayLibre/clk-meson …

…into clk-meson Pull more Amlogic Meson clk driver udpates from Jerome Brunet: - Do not register clock inputs in clock provider - Add g12a support in the axg audio clock controller * tag 'meson-clk-5.2-2' of https://github.com/BayLibre/clk-meson: clk: meson: axg-audio: add g12a support clk: meson: axg-audio: don't register inputs in the onecell data clk: meson: axg_audio: replace prefix axg by aud dt-bindings: clk: axg-audio: add g12a support
mariux64 · Apr 18, 2019 · 6e4fcc3 · 6e4fcc3
2 parents bc840f3 + 0750013
commit 6e4fcc3
Show file tree

Hide file tree

Showing 4 changed files with 736 additions and 532 deletions.
diff --git a/Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt b/Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt
@@ -6,7 +6,8 @@ devices.
 
 Required Properties:
 
-- compatible	: should be "amlogic,axg-audio-clkc" for the A113X and A113D
+- compatible	: should be "amlogic,axg-audio-clkc" for the A113X and A113D,
+		  "amlogic,g12a-audio-clkc" for G12A.
 - reg		: physical base address of the clock controller and length of
 		  memory mapped region.
 - clocks	: a list of phandle + clock-specifier pairs for the clocks listed