Merge branch 'v4.14-shared/clkids' into v4.14-clk/next

358efd52 · Heiko Stuebner · 5d890c2d · 1858698e · 358efd52 · 358efd52
Commit 358efd52 authored Aug 22, 2017 by Heiko Stuebner
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

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

include/dt-bindings/clock/rv1108-cru.h include/dt-bindings/clock/rv1108-cru.h +2 -0

No files found.
--- a/include/dt-bindings/clock/rk3228-cru.h
+++ b/include/dt-bindings/clock/rk3228-cru.h
@@ -49,6 +49,7 @@
 #define SCLK_EMMC_DRV		117
 #define SCLK_SDMMC_SAMPLE	118
 #define SCLK_SDIO_SAMPLE	119
+#define SCLK_SDIO_SRC		120
 #define SCLK_EMMC_SAMPLE	121
 #define SCLK_VOP		122
 #define SCLK_HDMI_HDCP		123

--- a/include/dt-bindings/clock/rv1108-cru.h
+++ b/include/dt-bindings/clock/rv1108-cru.h
@@ -110,6 +110,7 @@
 #define ACLK_CIF2			207
 #define ACLK_CIF3			208
 #define ACLK_PERI			209
+#define ACLK_GMAC			210
 /* pclk gates */
 #define PCLK_GPIO1			256
@@ -141,6 +142,7 @@
 #define PCLK_EFUSE0			282
 #define PCLK_EFUSE1			283
 #define PCLK_WDT			284
+#define PCLK_GMAC			285
 /* hclk gates */
 #define HCLK_I2S0_8CH			320