Commit 04a299ea authored by Heiko Stuebner's avatar Heiko Stuebner
Browse files

Merge branch 'v6.2-shared/clockids' into v6.2-armsoc/dts64

parents 7f767e68 b136468a

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

+3 −3
Original line number Diff line number Diff line
@@ -547,8 +547,8 @@ 
#define SRST_H_PERILP0			171

#define SRST_H_PERILP0_NOC		172

#define SRST_ROM			173

#define SRST_CRYPTO_S			174

#define SRST_CRYPTO_M			175

#define SRST_CRYPTO0_S			174

#define SRST_CRYPTO0_M			175



/* cru_softrst_con11 */

#define SRST_P_DCF			176
@@ -556,7 +556,7 @@ 
#define SRST_CM0S			178

#define SRST_CM0S_DBG			179

#define SRST_CM0S_PO			180

#define SRST_CRYPTO			181

#define SRST_CRYPTO0			181

#define SRST_P_PERILP1_SGRF		182

#define SRST_P_PERILP1_GRF		183

#define SRST_CRYPTO1_S			184