diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-10-18 07:02:04 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-10-18 07:02:04 -0700 |
| commit | 60cd8b09f1e26dec0e866085f110d1d665d53cec (patch) | |
| tree | 7b16d53ca5d759c0419254fd2eb9d7d1c8dff61a /arch/arm/mach-rockchip | |
| parent | 163556896d2fea757e0f87b44b537ff7d5b57807 (diff) | |
| parent | 6bcf60f8d557f15c85faf82ccbfc38cf986c45cc (diff) | |
Merge branch 'rockchip/boards' into next/boards
From Heiko Stübner:
Support for the RK3188 SoC, basic RK3188 based Radxa Rock board
and RK3066a based BQ Curie2 tablet.
* rockchip/boards:
ARM: rockchip: add support for rk3188 and Radxa Rock board
ARM: rockchip: add dts for bqcurie2 tablet
ARM: rockchip: enable arm-global-timer
ARM: rockchip: move shared dt properties to common source file
Diffstat (limited to 'arch/arm/mach-rockchip')
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 25ee12b21f01..6fef4647b6fe 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -11,6 +11,8 @@ config ARCH_ROCKCHIP select COMMON_CLK select GENERIC_CLOCKEVENTS select DW_APB_TIMER_OF + select ARM_GLOBAL_TIMER + select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK help Support for Rockchip's Cortex-A9 Single-to-Quad-Core-SoCs containing the RK2928, RK30xx and RK31xx series. |