diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2020-07-21 11:01:11 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2020-07-21 11:01:11 +0300 |
| commit | b396b3d206cdc7942e8c4f008f994066b4cb3c71 (patch) | |
| tree | 5b8a8475d8a0438c7fd1c6a669f27b56287f4da0 /include/dt-bindings/clock | |
| parent | fca14845764a93d74c285a98c010885e0d3295d9 (diff) | |
| parent | bfd35bf9cebc3627fd010c1230e3da154369b016 (diff) | |
| download | linux-b396b3d206cdc7942e8c4f008f994066b4cb3c71.tar.xz | |
Merge branch 'clk-amlogic' into clk-next
* clk-amlogic:
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/dt-bindings/clock')
| -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 */ |