diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2017-04-04 16:16:52 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2017-04-04 16:16:52 -0700 |
| commit | b2121170143bf4708c657461740c922ce24bc94e (patch) | |
| tree | 369d20b5243266d298e2ee12da1b12e24deda339 /Documentation/devicetree | |
| parent | 6939db7e0dbfb94a4fea47a67f1fcf6234c407a0 (diff) | |
| parent | 92c2cc5d5566cb84e4f4a683e73c3516882c2ee8 (diff) | |
| download | linux-next-b2121170143bf4708c657461740c922ce24bc94e.tar.gz | |
Merge tag 'amlogic-clk-headers' into v4.12/dt64
Amlogic clock headers and DT binding updates for v4.12
- add clocks for I2S and Mali
# gpg: Signature made Tue Apr 4 16:07:50 2017 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <khilman@kernel.org>" [ultimate]
# gpg: aka "Kevin Hilman <khilman@deeprootsystems.com>" [ultimate]
# gpg: aka "Kevin Hilman <khilman@gmail.com>" [ultimate]
# gpg: aka "Kevin Hilman <khilman@baylibre.com>" [ultimate]
* tag 'amlogic-clk-headers':
dt-bindings: clock: gxbb-clkc: Add GXL compatible variant
clk: meson-gxbb: Expose GP0 dt-bindings clock id
clk: meson-gxbb: Add MALI clock IDS
dt-bindings: clk: gxbb: expose i2s output clock gates
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt b/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt index ce06435d28ed..a09d627b5508 100644 --- a/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt +++ b/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt @@ -5,7 +5,8 @@ controllers within the SoC. Required Properties: -- compatible: should be "amlogic,gxbb-clkc" +- compatible: should be "amlogic,gxbb-clkc" for GXBB SoC, + or "amlogic,gxl-clkc" for GXL and GXM SoC. - reg: physical base address of the clock controller and length of memory mapped region. |