diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2017-04-12 19:51:43 +0300 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2017-04-12 19:51:43 +0300 |
| commit | 0d7a5328dba0d3e299d7d611e4ec059b8cab4f38 (patch) | |
| tree | b71591a6d3ee0d040b87f95366f5a3aaeec9270e /Documentation/devicetree/bindings/clock | |
| parent | 17c34c566795ca7529cf888fb33fdb7997d6b202 (diff) | |
| parent | 3a429818a2e48928ae0114df5fb3b0612dd57001 (diff) | |
| download | linux-0d7a5328dba0d3e299d7d611e4ec059b8cab4f38.tar.xz | |
Merge tag 'amlogic-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into clk-next
Same great taste as the previous pull request, but now with 50% less DT
bikeshedding!
Amlogic clock driver updates for v4.12
- meson8: add some new PLLs
- new clocks for Mali
- misc fixes.
Diffstat (limited to 'Documentation/devicetree/bindings/clock')
| -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. |