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

f79c3c01 · Heiko Stuebner · b52f4914 · 4d742e62 · f79c3c01 · f79c3c01
Commit f79c3c01 authored Sep 27, 2014 by Heiko Stuebner
Showing with 2 additions and 0 deletions

include/dt-bindings/clock/rk3188-cru-common.h include/dt-bindings/clock/rk3188-cru-common.h +1 -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
@@ -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