Skip to content

Commit 2865b25

Browse files
committed
Merge branch 'v6.10-shared/clkids' into v6.10-clk/next
2 parents 4cece76 + ca151fd commit 2865b25

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

include/dt-bindings/clock/rk3568-cru.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
#define CPLL_333M 9
7979
#define ARMCLK 10
8080
#define USB480M 11
81+
#define USB480M_PHY 12
8182
#define ACLK_CORE_NIU2BUS 18
8283
#define CLK_CORE_PVTM 19
8384
#define CLK_CORE_PVTM_CORE 20

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,4 +751,6 @@
751751
#define SRST_P_TRNG_CHK 658
752752
#define SRST_TRNG_S 659
753753

754+
#define SRST_A_HDMIRX_BIU 660
755+
754756
#endif

0 commit comments

Comments
 (0)