diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2020-07-21 01:01:11 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2020-07-21 01:01:11 -0700 |
| commit | b396b3d206cdc7942e8c4f008f994066b4cb3c71 (patch) | |
| tree | 5b8a8475d8a0438c7fd1c6a669f27b56287f4da0 /drivers/clk/meson/meson8b.h | |
| parent | fca14845764a93d74c285a98c010885e0d3295d9 (diff) | |
| parent | bfd35bf9cebc3627fd010c1230e3da154369b016 (diff) | |
| download | linux-b396b3d206cdc7942e8c4f008f994066b4cb3c71.tar.bz2 | |
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 'drivers/clk/meson/meson8b.h')
| -rw-r--r-- | drivers/clk/meson/meson8b.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/meson/meson8b.h b/drivers/clk/meson/meson8b.h index 3958b580d942..b1a5074cf148 100644 --- a/drivers/clk/meson/meson8b.h +++ b/drivers/clk/meson/meson8b.h @@ -180,8 +180,10 @@ #define CLKID_CTS_AMCLK_DIV 208 #define CLKID_CTS_MCLK_I958_SEL 210 #define CLKID_CTS_MCLK_I958_DIV 211 +#define CLKID_VCLK_EN 214 +#define CLKID_VCLK2_EN 215 -#define CLK_NR_CLKS 214 +#define CLK_NR_CLKS 216 /* * include the CLKID and RESETID that have |