summaryrefslogtreecommitdiff
path: root/include/dt-bindings
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2014-09-27 19:56:55 +0400
committerHeiko Stuebner <heiko@sntech.de>2014-09-27 19:56:55 +0400
commitf79c3c015485374b4f453932c45fbcb80a75a1a9 (patch)
treecd6d647a0fb5869c5a475c584187bcdde9ce46ea /include/dt-bindings
parentb52f4914f3be3ff50e7308e3ce03a2ce71195ecc (diff)
parent4d742e6230b5ff157422d91d6ae8d2fc1303eb28 (diff)
downloadlinux-f79c3c015485374b4f453932c45fbcb80a75a1a9.tar.xz
Merge branch 'v3.18-next/armclkid' into v3.18-next/cpuclk
Diffstat (limited to 'include/dt-bindings')
-rw-r--r--include/dt-bindings/clock/rk3188-cru-common.h1
-rw-r--r--include/dt-bindings/clock/rk3288-cru.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/rk3188-cru-common.h b/include/dt-bindings/clock/rk3188-cru-common.h
index 750ee60e75fb..6a370503c954 100644
--- 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
diff --git a/include/dt-bindings/clock/rk3288-cru.h b/include/dt-bindings/clock/rk3288-cru.h
index 750e5587a7aa..100a08c47692 100644
--- 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