diff options
author | Stephen Boyd <sboyd@kernel.org> | 2021-02-08 12:30:47 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2021-02-08 12:30:47 -0800 |
commit | 33aa1c394c858e434c1901bfa740af9952a23e49 (patch) | |
tree | 8a0782e50b7056d42015b4374f6c029f64307277 /include/dt-bindings | |
parent | eca8b0bea08292d1dd98bd6e1c2ecb672043f2cc (diff) | |
parent | b56e1cc4235615dcf5a525e52881f20b41e2819c (diff) | |
download | linux-next-33aa1c394c858e434c1901bfa740af9952a23e49.tar.gz |
Merge branch 'clk-rockchip' into clk-next
* clk-rockchip:
clk: rockchip: fix DPHY gate locations on rk3368
clk: rockchip: use clock id for SCLK_VIP_OUT on rk3368
clk: rockchip: add clock id for SCLK_VIP_OUT on rk3368
clk: rockchip: use clock ids for PCLK_DPHYRX and PCLK_DPHYTX0 on rk3368
clk: rockchip: add clock ids for PCLK_DPHYRX and PCLK_DPHYTX0 on rk3368
clk: rockchip: Demote non-conformant kernel-doc header in half-divider
clk: rockchip: Demote kernel-doc abuses to standard comment blocks in plls
clk: rockchip: Remove unused/undocumented struct members from clk-cpu
clk: rockchip: Demote non-conformant kernel-doc headers in main clock code
Diffstat (limited to 'include/dt-bindings')
-rw-r--r-- | include/dt-bindings/clock/rk3368-cru.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/rk3368-cru.h b/include/dt-bindings/clock/rk3368-cru.h index 0a06c5f514d7..83c72a163fd3 100644 --- a/include/dt-bindings/clock/rk3368-cru.h +++ b/include/dt-bindings/clock/rk3368-cru.h @@ -78,6 +78,7 @@ #define SCLK_TIMER13 136 #define SCLK_TIMER14 137 #define SCLK_TIMER15 138 +#define SCLK_VIP_OUT 139 #define DCLK_VOP 190 #define MCLK_CRYPTO 191 @@ -148,6 +149,8 @@ #define PCLK_VIP 367 #define PCLK_WDT 368 #define PCLK_EFUSE256 369 +#define PCLK_DPHYRX 370 +#define PCLK_DPHYTX0 371 /* hclk gates */ #define HCLK_SFC 448 |