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>

diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index fd3e47699e54ffee534f5b7e82811daf5b3f2ba0..0fcbcfd67de2ddaa67ae6ef7cc273bd71c1fdcb3 100644 (file)
--- 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 25ee12b21f0180f8cfcbead0377f2a0c3e71d80a..6fef4647b6fe462a65e6b285081a8ef21b50d0c2 100644 (file)
--- 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.