aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2013-09-30 10:29:55 -0400
committerHeiko Stuebner <heiko@sntech.de>2013-10-14 17:03:23 -0400
commitf95a2b3d98f349eecd97d8adef7085323acec7b7 (patch)
tree66f40623dceab7fb341a894565d5017edd275d42
parentf75efdd7687a366cb8a096c40bd44430abdf0cab (diff)
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>
-rw-r--r--arch/arm/boot/dts/rk3xxx.dtsi7
-rw-r--r--arch/arm/mach-rockchip/Kconfig2
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 @@
41 cache-level = <2>; 41 cache-level = <2>;
42 }; 42 };
43 43
44 global-timer@1013c200 {
45 compatible = "arm,cortex-a9-global-timer";
46 reg = <0x1013c200 0x20>;
47 interrupts = <GIC_PPI 11 0x304>;
48 clocks = <&dummy150m>;
49 };
50
44 local-timer@1013c600 { 51 local-timer@1013c600 {
45 compatible = "arm,cortex-a9-twd-timer"; 52 compatible = "arm,cortex-a9-twd-timer";
46 reg = <0x1013c600 0x20>; 53 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
11 select COMMON_CLK 11 select COMMON_CLK
12 select GENERIC_CLOCKEVENTS 12 select GENERIC_CLOCKEVENTS
13 select DW_APB_TIMER_OF 13 select DW_APB_TIMER_OF
14 select ARM_GLOBAL_TIMER
15 select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
14 help 16 help
15 Support for Rockchip's Cortex-A9 Single-to-Quad-Core-SoCs 17 Support for Rockchip's Cortex-A9 Single-to-Quad-Core-SoCs
16 containing the RK2928, RK30xx and RK31xx series. 18 containing the RK2928, RK30xx and RK31xx series.