]> Pileus Git - ~andy/linux/commitdiff
ARM: sun7i: a20: Add support for the High Speed Timers
authorMaxime Ripard <maxime.ripard@free-electrons.com>
Thu, 7 Nov 2013 11:01:48 +0000 (12:01 +0100)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Wed, 11 Dec 2013 10:40:01 +0000 (11:40 +0100)
The Allwinner A20 has support for four high speed timers. Apart for the
number of timers (4 vs 2), it's basically the same logic than the high
speed timers found in the sun5i chips.

Now that we have a driver to support it, we can enable them in the
device tree.

[dlezcano] : Fixed conflict with 428abbb8 "Enable the I2C controllers"

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Tested-by: Emilio López <emilio@elopez.com.ar>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
arch/arm/boot/dts/sun7i-a20.dtsi

index e46cfedde74c220b698c829458dfa40cef916159..ee6cec7b0c90c2c3d1e5131ab85fe3e1f2a02146 100644 (file)
                        status = "disabled";
                };
 
+               hstimer@01c60000 {
+                       compatible = "allwinner,sun7i-a20-hstimer";
+                       reg = <0x01c60000 0x1000>;
+                       interrupts = <0 81 1>,
+                                    <0 82 1>,
+                                    <0 83 1>,
+                                    <0 84 1>;
+                       clocks = <&ahb_gates 28>;
+               };
+
                gic: interrupt-controller@01c81000 {
                        compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
                        reg = <0x01c81000 0x1000>,