Merge branch 'v6.10-shared/clkids' into v6.10-clk/next

2865b25f · Heiko Stuebner · 4cece764 · ca151fd5 · 2865b25f · 2865b25f
Commit 2865b25f authored Apr 10, 2024 by Heiko Stuebner
Showing with 3 additions and 0 deletions

include/dt-bindings/clock/rk3568-cru.h include/dt-bindings/clock/rk3568-cru.h +1 -0

include/dt-bindings/reset/rockchip,rk3588-cru.h include/dt-bindings/reset/rockchip,rk3588-cru.h +2 -0

No files found.
--- a/include/dt-bindings/clock/rk3568-cru.h
+++ b/include/dt-bindings/clock/rk3568-cru.h
@@ -78,6 +78,7 @@
 #define CPLL_333M		9
 #define ARMCLK			10
 #define USB480M			11
+#define USB480M_PHY		12
 #define ACLK_CORE_NIU2BUS	18
 #define CLK_CORE_PVTM		19
 #define CLK_CORE_PVTM_CORE	20

--- a/include/dt-bindings/reset/rockchip,rk3588-cru.h
+++ b/include/dt-bindings/reset/rockchip,rk3588-cru.h
@@ -751,4 +751,6 @@
 #define SRST_P_TRNG_CHK			658
 #define SRST_TRNG_S			659
+#define SRST_A_HDMIRX_BIU		660
 #endif