diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2016-04-16 03:04:15 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2016-04-16 03:04:15 +0200 |
| commit | bdb4da86198ecee79a06c97004ad96ee6aa98f9d (patch) | |
| tree | 52eed3b7cfde3b92ac111832d8cc7f2b4c320643 | |
| parent | 115510053e5e5872f1f19a2220b04aab5542c5c4 (diff) | |
| parent | 6111413be8708a7509fd9c09817a657f6bf8f749 (diff) | |
| download | op-kernel-dev-bdb4da86198ecee79a06c97004ad96ee6aa98f9d.zip op-kernel-dev-bdb4da86198ecee79a06c97004ad96ee6aa98f9d.tar.gz | |
Merge branch 'v4.7-shared/clkids' into v4.7-clk/next
| -rw-r--r-- | include/dt-bindings/clock/rk3399-cru.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h index 244746e..f60fe6e 100644 --- a/include/dt-bindings/clock/rk3399-cru.h +++ b/include/dt-bindings/clock/rk3399-cru.h @@ -136,7 +136,7 @@ #define DCLK_VOP1_DIV 183 #define DCLK_M0_PERILP 184 -#define FCLK_CM0S 190 +#define FCLK_CM0S 190 /* aclk gates */ #define ACLK_PERIHP 192 @@ -207,11 +207,11 @@ #define ACLK_CORE_ADB400_CORE_B_2_CCI500 257 #define ACLK_ADB400M_PD_CORE_L 258 #define ACLK_ADB400M_PD_CORE_B 259 -#define ACLK_PERF_CORE_L 260 -#define ACLK_PERF_CORE_B 261 -#define ACLK_GIC_PRE 262 -#define ACLK_VOP0_PRE 263 -#define ACLK_VOP1_PRE 264 +#define ACLK_PERF_CORE_L 260 +#define ACLK_PERF_CORE_B 261 +#define ACLK_GIC_PRE 262 +#define ACLK_VOP0_PRE 263 +#define ACLK_VOP1_PRE 264 /* pclk gates */ #define PCLK_PERIHP 320 @@ -279,12 +279,12 @@ #define PCLK_EFUSE1024S 382 #define PCLK_PMU_INTR_ARB 383 #define PCLK_MAILBOX0 384 -#define PCLK_USBPHY_MUX_G 385 -#define PCLK_UPHY0_TCPHY_G 386 -#define PCLK_UPHY0_TCPD_G 387 -#define PCLK_UPHY1_TCPHY_G 388 -#define PCLK_UPHY1_TCPD_G 389 -#define PCLK_ALIVE 390 +#define PCLK_USBPHY_MUX_G 385 +#define PCLK_UPHY0_TCPHY_G 386 +#define PCLK_UPHY0_TCPD_G 387 +#define PCLK_UPHY1_TCPHY_G 388 +#define PCLK_UPHY1_TCPD_G 389 +#define PCLK_ALIVE 390 /* hclk gates */ #define HCLK_PERIHP 448 |
