Merge branch 'v3.20-clk/new-ids' into v3.20-armsoc/dts

d052c329 · Heiko Stuebner · 11ff8c86 · b82465c9 · d052c329
Commit d052c329 authored Jan 28, 2015 by Heiko Stuebner
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

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

No files found.
--- a/include/dt-bindings/clock/rk3288-cru.h
+++ b/include/dt-bindings/clock/rk3288-cru.h
@@ -80,6 +80,9 @@
 #define SCLK_SDIO0_SAMPLE	119
 #define SCLK_SDIO1_SAMPLE	120
 #define SCLK_EMMC_SAMPLE	121
+#define SCLK_USBPHY480M_SRC	122
+#define SCLK_PVTM_CORE		123
+#define SCLK_PVTM_GPU		124
 #define DCLK_VOP0		190
 #define DCLK_VOP1		191
@@ -154,6 +157,7 @@
 #define PCLK_PUBL0		365
 #define PCLK_DDRUPCTL1		366
 #define PCLK_PUBL1		367
+#define PCLK_WDT		368
 /* hclk gates */
 #define HCLK_GPS		448