Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3xxx.dtsi

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>;