diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2019-10-16 10:02:25 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2019-10-16 10:02:25 -0700 |
| commit | f21ab7906daf30ab27e485d459b481d6ad3af86f (patch) | |
| tree | fb2e84420dc14cf68f11f2235054b90484941bb3 /Documentation | |
| parent | 016a4d6b1bfde534cb8ccd3b8f3aa485126de444 (diff) | |
| parent | aa03ea9bce8c4e45749077254f376b236026f6a0 (diff) | |
| download | linux-f21ab7906daf30ab27e485d459b481d6ad3af86f.tar.gz linux-f21ab7906daf30ab27e485d459b481d6ad3af86f.tar.bz2 linux-f21ab7906daf30ab27e485d459b481d6ad3af86f.zip | |
Merge tag 'clk-meson-dt-v5.5-1' of git://github.com/BayLibre/clk-meson into v5.5/dt64-redo
First round of amlogic DT binding clock update target for v5.5
Add the audio clock and reset bindings for the sm1 SoC family
* tag 'clk-meson-dt-v5.5-1' of git://github.com/BayLibre/clk-meson:
dt-bindings: clock: meson: add sm1 resets to the axg-audio controller
dt-bindings: clk: axg-audio: add sm1 bindings
Diffstat (limited to 'Documentation')
| -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 b3957d10d241..3a8948c04bc9 100644 --- a/Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt +++ b/Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt @@ -7,7 +7,8 @@ devices. Required Properties: - compatible : should be "amlogic,axg-audio-clkc" for the A113X and A113D, - "amlogic,g12a-audio-clkc" for G12A. + "amlogic,g12a-audio-clkc" for G12A, + "amlogic,sm1-audio-clkc" for S905X3. - 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 |