diff options
| author | Stephen Boyd | 2019-06-25 02:40:40 +0200 |
|---|---|---|
| committer | Stephen Boyd | 2019-06-25 02:40:40 +0200 |
| commit | afa88bdbf19314494415d622d50730b5d854dd91 (patch) | |
| tree | 14f34850e10c35deae120c1ccd2dc9e13c93cb9a /include/dt-bindings | |
| parent | Linux 5.2-rc1 (diff) | |
| parent | clk: meson: g12a: mark fclk_div3 as critical (diff) | |
| download | kernel-qcow2-linux-afa88bdbf19314494415d622d50730b5d854dd91.tar.gz kernel-qcow2-linux-afa88bdbf19314494415d622d50730b5d854dd91.tar.xz kernel-qcow2-linux-afa88bdbf19314494415d622d50730b5d854dd91.zip | |
Merge tag 'clk-meson-5.3-1' of https://github.com/BayLibre/clk-meson into clk-meson
Pull Amlogic clk driver updates from Jerome Brunet:
- Fix mpll fractional part and spread sprectrum issues
- Add meson8 audio clocks
- Add g12a temperature sensors clocks
- Add g12a and g12b cpu clocks
* tag 'clk-meson-5.3-1' of https://github.com/BayLibre/clk-meson:
clk: meson: g12a: mark fclk_div3 as critical
clk: meson: g12a: Add support for G12B CPUB clocks
dt-bindings: clk: meson: add g12b periph clock controller bindings
clk: meson-g12a: add temperature sensor clocks
dt-bindings: clk: g12a-clkc: add Temperature Sensor clock IDs
clk: meson: meson8b: add the cts_i958 clock
clk: meson: meson8b: add the cts_mclk_i958 clocks
clk: meson: meson8b: add the cts_amclk clocks
dt-bindings: clock: meson8b: add the audio clocks
clk: meson: g12a: add controller register init
clk: meson: eeclk: add init regs
clk: meson: g12a: add mpll register init sequences
clk: meson: mpll: add init callback and regs
clk: meson: axg: spread spectrum is on mpll2
clk: meson: gxbb: no spread spectrum on mpll0
clk: meson: mpll: properly handle spread spectrum
clk: meson: meson8b: fix a typo in the VPU parent names array variable
clk: meson: fix MPLL 50M binding id typo
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/g12a-clkc.h | 3 | ||||
| -rw-r--r-- | include/dt-bindings/clock/meson8b-clkc.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h index 82c9e0c020b2..b6b127e45634 100644 --- a/include/dt-bindings/clock/g12a-clkc.h +++ b/include/dt-bindings/clock/g12a-clkc.h @@ -130,11 +130,12 @@ #define CLKID_MALI_1_SEL 172 #define CLKID_MALI_1 174 #define CLKID_MALI 175 -#define CLKID_MPLL_5OM 177 +#define CLKID_MPLL_50M 177 #define CLKID_CPU_CLK 187 #define CLKID_PCIE_PLL 201 #define CLKID_VDEC_1 204 #define CLKID_VDEC_HEVC 207 #define CLKID_VDEC_HEVCF 210 +#define CLKID_TS 212 #endif /* __G12A_CLKC_H */ diff --git a/include/dt-bindings/clock/meson8b-clkc.h b/include/dt-bindings/clock/meson8b-clkc.h index 47556539f0ee..68862aaf977e 100644 --- a/include/dt-bindings/clock/meson8b-clkc.h +++ b/include/dt-bindings/clock/meson8b-clkc.h @@ -112,5 +112,8 @@ #define CLKID_VDEC_HCODEC 199 #define CLKID_VDEC_2 202 #define CLKID_VDEC_HEVC 206 +#define CLKID_CTS_AMCLK 209 +#define CLKID_CTS_MCLK_I958 212 +#define CLKID_CTS_I958 213 #endif /* __MESON8B_CLKC_H */ |