Merge branch 'v3.18-next/armclkid' into v3.18-next/cpuclk

2014-09-27 17:56:55 +02:00 · 2014-09-27 17:56:55 +02:00 · f79c3c0154
parent b52f4914f3 4d742e6230
commit f79c3c0154
2 changed files with 2 additions and 0 deletions
--- a/include/dt-bindings/clock/rk3188-cru-common.h
+++ b/include/dt-bindings/clock/rk3188-cru-common.h
@ -20,6 +20,7 @@
 #define PLL_GPLL		4
 #define CORE_PERI		5
 #define CORE_L2C		6
+#define ARMCLK			7

 /* sclk gates (special clocks) */
 #define SCLK_UART0		64
--- a/include/dt-bindings/clock/rk3288-cru.h
+++ b/include/dt-bindings/clock/rk3288-cru.h
@ -19,6 +19,7 @@
 #define PLL_CPLL		3
 #define PLL_GPLL		4
 #define PLL_NPLL		5
+#define ARMCLK			6

 /* sclk gates (special clocks) */
 #define SCLK_GPU		64