summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree
diff options
context:
space:
mode:
authorKevin Hilman <khilman@baylibre.com>2018-05-23 11:20:31 -0700
committerKevin Hilman <khilman@baylibre.com>2018-05-23 11:20:31 -0700
commit019c5beb43fc07e00de6d540cd0c1df73c4abe0e (patch)
tree1c3b3397331751b876b51084a6f72751ab72520f /Documentation/devicetree
parentffe2f2a415a5c36c0629c0ac8ea3dda80fbfd4b6 (diff)
parent9c7aea8e17d435beeabfed88ff46a811eeb92ae4 (diff)
downloadlinux-019c5beb43fc07e00de6d540cd0c1df73c4abe0e.tar.gz
linux-019c5beb43fc07e00de6d540cd0c1df73c4abe0e.tar.bz2
linux-019c5beb43fc07e00de6d540cd0c1df73c4abe0e.zip
Merge tag 'for-kevin-meson-clk-bindings-v4.18-1' of https://github.com/BayLibre/clk-meson into v4.18/dt64
First round of binding update for meson clocks targeted at v4.18 # gpg: Signature made Wed May 16 01:23:15 2018 PDT # gpg: using RSA key F4E159AE18F3F56D5F1BB71BE6FC0F1C37F2DA85 # gpg: Can't check signature: No public key * tag 'for-kevin-meson-clk-bindings-v4.18-1' of https://github.com/BayLibre/clk-meson: dt-bindings: clock: reset: Add AXG AO Clock and Reset Bindings dt-bindings: clock: axg-aoclkc: New binding for Meson-AXG SoC clk: meson: gxbb: expose VDEC_1 and VDEC_HEVC clocks dt-bindings: clock: meson8b: export the NAND clock
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r--Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt b/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
index 786dc39ca904..3a880528030e 100644
--- a/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
+++ b/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt
@@ -9,6 +9,7 @@ Required Properties:
- GXBB (S905) : "amlogic,meson-gxbb-aoclkc"
- GXL (S905X, S905D) : "amlogic,meson-gxl-aoclkc"
- GXM (S912) : "amlogic,meson-gxm-aoclkc"
+ - AXG (A113D, A113X) : "amlogic,meson-axg-aoclkc"
followed by the common "amlogic,meson-gx-aoclkc"
- #clock-cells: should be 1.