diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2013-09-30 16:29:55 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2013-10-14 23:03:23 +0200 |
| commit | f95a2b3d98f349eecd97d8adef7085323acec7b7 (patch) | |
| tree | 66f40623dceab7fb341a894565d5017edd275d42 /arch | |
| parent | f75efdd7687a366cb8a096c40bd44430abdf0cab (diff) | |
| download | linux-f95a2b3d98f349eecd97d8adef7085323acec7b7.tar.gz linux-f95a2b3d98f349eecd97d8adef7085323acec7b7.tar.bz2 linux-f95a2b3d98f349eecd97d8adef7085323acec7b7.zip | |
ARM: rockchip: enable arm-global-timer
RK2928 and RK3066 contain a dw_apb timer component, while the rk3188 uses
a slightly similar but still different timer component. But all of them
support the ARM-global-timer that got added as clocksource driver recently.
So enable support for it to get a working clocksource for rk3188.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/rk3xxx.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index fd3e47699e54..0fcbcfd67de2 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi @@ -41,6 +41,13 @@ cache-level = <2>; }; + global-timer@1013c200 { + compatible = "arm,cortex-a9-global-timer"; + reg = <0x1013c200 0x20>; + interrupts = <GIC_PPI 11 0x304>; + clocks = <&dummy150m>; + }; + local-timer@1013c600 { compatible = "arm,cortex-a9-twd-timer"; reg = <0x1013c600 0x20>; 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. |