diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2014-09-27 17:56:55 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2014-09-27 17:56:55 +0200 |
| commit | f79c3c015485374b4f453932c45fbcb80a75a1a9 (patch) | |
| tree | cd6d647a0fb5869c5a475c584187bcdde9ce46ea /include | |
| parent | asm-generic: COMMON_CLK defines __clk_{get,put} (diff) | |
| parent | clk: rockchip: add binding id for ARMCLK (diff) | |
| download | linux-f79c3c015485374b4f453932c45fbcb80a75a1a9.tar.xz linux-f79c3c015485374b4f453932c45fbcb80a75a1a9.zip | |
Merge branch 'v3.18-next/armclkid' into v3.18-next/cpuclk
Diffstat (limited to 'include')
| -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 @@ #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 |