diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-04-18 13:30:05 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-04-18 13:30:05 -0700 |
| commit | 6e4fcc34e6a35b1ca553940cf952e7c0a1ed4cfe (patch) | |
| tree | 37d8a0a3b6ff0681e7301bd209e42105a8f67690 /Documentation/devicetree | |
| parent | bc840f3357b8c471cfda25980efafb59dfbc1864 (diff) | |
| parent | 075001385c66a00fba9810b9ecb88d644384df88 (diff) | |
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
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt b/Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt index 61777ad24f61..0f777749f4f1 100644 --- 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 |