diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2017-02-03 21:07:35 +0100 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-02-03 21:07:35 +0100 |
| commit | 5775a4c76fbc0321671503c815d8a2ef657e0281 (patch) | |
| tree | 5ed95e4f16c5fbd2ea2a6fb62001c092ed46653a /include | |
| parent | clk: uniphier: add eMMC clock for LD11 and LD20 SoCs (diff) | |
| parent | clk: rockchip: rk3288: make all niu clocks critical (diff) | |
| download | linux-5775a4c76fbc0321671503c815d8a2ef657e0281.tar.xz linux-5775a4c76fbc0321671503c815d8a2ef657e0281.zip | |
Merge tag 'v4.11-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next
Pull Rockchip clk updates from Heiko Stuebner:
"Non-critical fix for the pclk_edp divider on rk3399, one new
clock-id and making niu (interconnect) clocks critical on
rk3288, as CLK_IGNORE_UNUSED is not enough to keep them running
all the time when more users access particular clock subtrees."
* tag 'v4.11-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
clk: rockchip: rk3288: make all niu clocks critical
clk: rockchip: use rk3288 vip_out clock ids
clk: rockchip: add rk3288 vip_out clock id
clk: rockchip: fix the incorrect pclk_edp div width for RK3399
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/rk3288-cru.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h index 08de7de649e2..d7b6c83ea63f 100644 --- a/include/dt-bindings/clock/rk3288-cru.h +++ b/include/dt-bindings/clock/rk3288-cru.h @@ -88,6 +88,7 @@ #define SCLK_PVTM_GPU 124 #define SCLK_CRYPTO 125 #define SCLK_MIPIDSI_24M 126 +#define SCLK_VIP_OUT 127 #define SCLK_MAC 151 #define SCLK_MACREF_OUT 152 |