Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Heiko Stuebner 8 years ago
parent
8118fe40d4 4688708271
commit
7fc505089c
2 changed files with 3 additions and 0 deletions
Split View Show Diff Stats
  1. 2 0
      include/dt-bindings/clock/rk3188-cru-common.h
  2. 1 0
      include/dt-bindings/clock/rk3288-cru.h

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

@@ -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

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

@@ -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