diff options
| author |   Stephen Boyd <sboyd@kernel.org> | 2019-11-13 11:27:45 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-11-13 11:27:45 -0800 |
| commit | 9320c7ddf968251073e8fcc7bbc376fd4c044f4c (patch) | |
| tree | 82fb50bc3134a7bbbec72cc351288e8697f269b1 /include | |
| parent | Linux 5.4-rc1 (diff) | |
| parent | clk: rockchip: protect the pclk_usb_grf as critical on px30 (diff) | |
Merge tag 'v5.5-rockchip-clk-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-rockchip
Pull Rockchip clk driver updates from Heiko Stuebner:
Adding a missing static declaration for clk_half_divider_ops
and a number of improvements for the px30 clock tree.
* tag 'v5.5-rockchip-clk-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
clk: rockchip: protect the pclk_usb_grf as critical on px30
clk: rockchip: add video-related niu clocks as critical on px30
clk: rockchip: move px30 critical clocks to correct clock controller
clk: rockchip: Add div50 clocks for px30 sdmmc, emmc, sdio and nandc
clk: rockchip: Add div50 clock-ids for sdmmc on px30 and nandc
clk: rockchip: make clk_half_divider_ops static
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/px30-cru.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/px30-cru.h b/include/dt-bindings/clock/px30-cru.h index 00101479f7c4..5b1416fcde6f 100644 --- a/include/dt-bindings/clock/px30-cru.h +++ b/include/dt-bindings/clock/px30-cru.h @@ -85,6 +85,8 @@ #define SCLK_EMMC_DIV50 83 #define SCLK_DDRCLK 84 #define SCLK_UART1_SRC 85 +#define SCLK_SDMMC_DIV 86 +#define SCLK_SDMMC_DIV50 87 /* dclk gates */ #define DCLK_VOPB 150 |