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

diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h
index f60ce72a2b2c76c23da6fa52c7eb470d39195633..1e626335acf3d66ade8596e37921264138e4b9a1 100644 (file)
--- 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