diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2024-02-29 00:56:30 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2024-02-29 00:56:30 +0300 |
| commit | 3e76237ee7cfb6f74e9a82d45a85a90e7ee64ae5 (patch) | |
| tree | 44b8c8eab092260d7de219cfef62d17d82d2a545 /include | |
| parent | 6613476e225e090cc9aad49be7fa504e290dd33d (diff) | |
| parent | 1361d75503fccc0e6b3ecbcd5bb53bbdfdc52f0a (diff) | |
| download | linux-3e76237ee7cfb6f74e9a82d45a85a90e7ee64ae5.tar.xz | |
Merge tag 'v6.9-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-rockchip
Pull Rockchip clk driver updates from Heiko Stuebner:
- New pll-rate for rk3568
- i2s rate improvements for rk3399
- rk3588 syscon clock fixes and removal of overall clock-number from
the rk3588 binding header
- a prerequisite for later improvements to the rk3588 linked clocks
* tag 'v6.9-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
clk: rockchip: rk3399: Allow to set rate of clk_i2s0_frac's parent
clk: rockchip: rk3588: use linked clock ID for GATE_LINK
clk: rockchip: rk3588: fix indent
clk: rockchip: rk3588: fix pclk_vo0grf and pclk_vo1grf
dt-bindings: clock: rk3588: add missing PCLK_VO1GRF
dt-bindings: clock: rk3588: drop CLK_NR_CLKS
clk: rockchip: rk3588: fix CLK_NR_CLKS usage
clk: rockchip: rk3568: Add PLL rate for 128MHz
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/rockchip,rk3588-cru.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/rockchip,rk3588-cru.h b/include/dt-bindings/clock/rockchip,rk3588-cru.h index 5790b1391201..0c7d3ca2d5bc 100644 --- a/include/dt-bindings/clock/rockchip,rk3588-cru.h +++ b/include/dt-bindings/clock/rockchip,rk3588-cru.h @@ -733,8 +733,7 @@ #define ACLK_AV1_PRE 718 #define PCLK_AV1_PRE 719 #define HCLK_SDIO_PRE 720 - -#define CLK_NR_CLKS (HCLK_SDIO_PRE + 1) +#define PCLK_VO1GRF 721 /* scmi-clocks indices */ |