Commit 2865b25f authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

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

parents 4cece764 ca151fd5
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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
+2 −0
Original line number Diff line number Diff line
@@ -751,4 +751,6 @@
#define SRST_P_TRNG_CHK			658
#define SRST_TRNG_S			659

#define SRST_A_HDMIRX_BIU		660

#endif