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

7fc50508 · Heiko Stuebner · 8118fe40 · 46887082 · 7fc50508 · 7fc50508
Commit 7fc50508 authored Jan 13, 2017 by Heiko Stuebner
Showing with 3 additions and 0 deletions

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

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

No files found.
--- a/include/dt-bindings/clock/rk3188-cru-common.h
+++ b/include/dt-bindings/clock/rk3188-cru-common.h
@@ -108,6 +108,8 @@
 #define PCLK_TSADC		349
 #define PCLK_CPU		350
 #define PCLK_PERI		351
+#define PCLK_DDRUPCTL		352
+#define PCLK_PUBL		353

 /* hclk gates */
 #define HCLK_SDMMC		448

--- a/include/dt-bindings/clock/rk3288-cru.h
+++ b/include/dt-bindings/clock/rk3288-cru.h
@@ -168,6 +168,7 @@
 #define PCLK_WDT		368
 #define PCLK_EFUSE256		369
 #define PCLK_EFUSE1024		370
+#define PCLK_ISP_IN		371

 /* hclk gates */
 #define HCLK_GPS		448