diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-10-18 19:15:37 +0200 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-10-18 19:15:37 +0200 |
| commit | 1b4d990b19d2de186b188da5b033110949c118fe (patch) | |
| tree | d8b381ddd6e95f347ea889d4cd05c94a331f4305 /include/dt-bindings | |
| parent | Linux 4.19-rc1 (diff) | |
| parent | clk: rockchip: Fix static checker warning in rockchip_ddrclk_get_parent call (diff) | |
| download | linux-1b4d990b19d2de186b188da5b033110949c118fe.tar.xz linux-1b4d990b19d2de186b188da5b033110949c118fe.zip | |
Merge tag 'v4.20-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:
Fixes for static checker warning and a wrong shift value for the mmc
on rk3328, as well as setting a hdmi-id on rk3066 for a later driver
for the hdmi encoder on it and some adapted rk3288 pll rates to support
more and better hdmi rates.
* tag 'v4.20-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
clk: rockchip: Fix static checker warning in rockchip_ddrclk_get_parent call
clk: rockchip: use the newly added clock-id for hdmi on RK3066
clk: rockchip: add clock-id for HCLK_HDMI on rk3066
clk: rockchip: fix wrong mmc sample phase shift for rk3328
clk: rockchip: improve rk3288 pll rates for better hdmi output
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/rk3188-cru-common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h index b9462b7d3dfe..dc2101a634be 100644 --- a/include/dt-bindings/clock/rk3188-cru-common.h +++ b/include/dt-bindings/clock/rk3188-cru-common.h @@ -139,8 +139,9 @@ #define HCLK_CIF1 470 #define HCLK_VEPU 471 #define HCLK_VDPU 472 +#define HCLK_HDMI 473 -#define CLK_NR_CLKS (HCLK_VDPU + 1) +#define CLK_NR_CLKS (HCLK_HDMI + 1) /* soft-reset indices */ #define SRST_MCORE 2 |