diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-27 21:50:40 +0200 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-27 21:50:40 +0200 |
| commit | 5ad67d3e5e0a5059945a7726a407763a23f80d9e (patch) | |
| tree | 365e8170b9553818317dd80724f1bacbc75e7916 /include/dt-bindings | |
| parent | Merge tag 'clk-mvebu-3.18' of git://git.infradead.org/linux-mvebu into clk-next (diff) | |
| parent | clk: rockchip: switch to using the new cpuclk type for armclk (diff) | |
| download | linux-5ad67d3e5e0a5059945a7726a407763a23f80d9e.tar.xz linux-5ad67d3e5e0a5059945a7726a407763a23f80d9e.zip | |
Merge tag 'v3.18-rockchip-cpuclk' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next
CPU clock handling for Rockchip SoCs
Diffstat (limited to 'include/dt-bindings')
| -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 |