diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2014-09-27 11:56:55 -0400 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2014-09-27 11:56:55 -0400 |
| commit | f79c3c015485374b4f453932c45fbcb80a75a1a9 (patch) | |
| tree | cd6d647a0fb5869c5a475c584187bcdde9ce46ea | |
| parent | b52f4914f3be3ff50e7308e3ce03a2ce71195ecc (diff) | |
| parent | 4d742e6230b5ff157422d91d6ae8d2fc1303eb28 (diff) | |
Merge branch 'v3.18-next/armclkid' into v3.18-next/cpuclk
| -rw-r--r-- | include/dt-bindings/clock/rk3188-cru-common.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/rk3288-cru.h | 1 |
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 @@ | |||
| 20 | #define PLL_GPLL 4 | 20 | #define PLL_GPLL 4 |
| 21 | #define CORE_PERI 5 | 21 | #define CORE_PERI 5 |
| 22 | #define CORE_L2C 6 | 22 | #define CORE_L2C 6 |
| 23 | #define ARMCLK 7 | ||
| 23 | 24 | ||
| 24 | /* sclk gates (special clocks) */ | 25 | /* sclk gates (special clocks) */ |
| 25 | #define SCLK_UART0 64 | 26 | #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 @@ | |||
| 19 | #define PLL_CPLL 3 | 19 | #define PLL_CPLL 3 |
| 20 | #define PLL_GPLL 4 | 20 | #define PLL_GPLL 4 |
| 21 | #define PLL_NPLL 5 | 21 | #define PLL_NPLL 5 |
| 22 | #define ARMCLK 6 | ||
| 22 | 23 | ||
| 23 | /* sclk gates (special clocks) */ | 24 | /* sclk gates (special clocks) */ |
| 24 | #define SCLK_GPU 64 | 25 | #define SCLK_GPU 64 |