diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2020-07-21 10:58:07 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2020-07-21 10:58:07 +0300 |
| commit | bfd35bf9cebc3627fd010c1230e3da154369b016 (patch) | |
| tree | 4b91c4d1d83e00fe9b7289898d066dd12095e497 /include | |
| parent | b3a9e3b9622ae10064826dccb4f7a52bd88c7407 (diff) | |
| parent | 2568528f55356a2f20f80a18244d3e235cbd2cab (diff) | |
| download | linux-bfd35bf9cebc3627fd010c1230e3da154369b016.tar.xz | |
Merge tag 'clk-meson-v5.9-1' of https://github.com/BayLibre/clk-meson into clk-amlogic
Pull Amlogic clk driver updates from Jerome Brunet:
- g12: add neural network accelerator clock sources
- meson8: remove critical flag for main PLL divider
- meson8: add video decoder clock gates
* tag 'clk-meson-v5.9-1' of https://github.com/BayLibre/clk-meson:
clk: meson: meson8b: add the vclk2_en gate clock
clk: meson: meson8b: add the vclk_en gate clock
clk: meson: meson8b: Drop CLK_IS_CRITICAL from fclk_div2
clk: meson: g12a: Add support for NNA CLK source clocks
dt-bindings: clk: g12a-clkc: Add NNA CLK Source clock IDs
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/g12a-clkc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h index b0d65d73db96..40d49940d8a8 100644 --- a/include/dt-bindings/clock/g12a-clkc.h +++ b/include/dt-bindings/clock/g12a-clkc.h @@ -145,5 +145,7 @@ #define CLKID_CPU3_CLK 255 #define CLKID_SPICC0_SCLK 258 #define CLKID_SPICC1_SCLK 261 +#define CLKID_NNA_AXI_CLK 264 +#define CLKID_NNA_CORE_CLK 267 #endif /* __G12A_CLKC_H */ |