diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-02-15 16:13:58 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-02-15 16:14:31 -0800 |
| commit | a9ca321716c801ae4e731b3a016c24633374b59b (patch) | |
| tree | 23918bcec4d035cc0755f4de6049d8cb3a421428 /Documentation | |
| parent | d8c22b32a612fb7940e9d1c0068fb80fcbfe8da7 (diff) | |
| parent | c5f09e6bd8a7537beef8ee53cd161a06b04de271 (diff) | |
Merge tag 'meson-clk-5.1-2' of https://github.com/BayLibre/clk-meson into clk-meson
Pull another set of Amlogic clk drivers updates from Neil Armstrong:
- Add G12A Always-On Clock Controller
- Fix Meson8 APB clock ID name
* tag 'meson-clk-5.1-2' of https://github.com/BayLibre/clk-meson:
clk: meson: meson8b: fix the naming of the APB clocks
dt-bindings: clock: meson8b: add APB clock definition
clk: meson: Add G12A AO Clock + Reset Controller
dt-bindings: clk: add G12A AO Clock and Reset Bindings
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt | 1 |
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 79511d7bb321..c41f0be5d438 100644 --- a/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt +++ b/Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt @@ -10,6 +10,7 @@ Required Properties: - GXL (S905X, S905D) : "amlogic,meson-gxl-aoclkc" - GXM (S912) : "amlogic,meson-gxm-aoclkc" - AXG (A113D, A113X) : "amlogic,meson-axg-aoclkc" + - G12A (S905X2, S905D2, S905Y2) : "amlogic,meson-g12a-aoclkc" followed by the common "amlogic,meson-gx-aoclkc" - clocks: list of clock phandle, one for each entry clock-names. - clock-names: should contain the following: |