Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / arm / boot / dts / sun6i-a31.dtsi

diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 2ad880c0821d6edf83f93d5ce580f68332022e63..a9dfa12eb73502d521f679d62c6af9b9fb62d7f9 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -27,6 +27,7 @@
 
 
        cpus {
+               enable-method = "allwinner,sun6i-a31";
                #address-cells = <1>;
                #size-cells = <0>;
 
@@ -409,7 +410,7 @@
                        status = "disabled";
                };
 
-               ohci2: usb@01c1c000 {
+               ohci2: usb@01c1c400 {
                        compatible = "allwinner,sun6i-a31-ohci", "generic-ohci";
                        reg = <0x01c1c400 0x100>;
                        interrupts = <0 77 4>;
@@ -620,6 +621,17 @@
                        status = "disabled";
                };
 
+               timer@01c60000 {
+                       compatible = "allwinner,sun6i-a31-hstimer", "allwinner,sun7i-a20-hstimer";
+                       reg = <0x01c60000 0x1000>;
+                       interrupts = <0 51 4>,
+                                    <0 52 4>,
+                                    <0 53 4>,
+                                    <0 54 4>;
+                       clocks = <&ahb1_gates 19>;
+                       resets = <&ahb1_rst 19>;
+               };
+
                spi0: spi@01c68000 {
                        compatible = "allwinner,sun6i-a31-spi";
                        reg = <0x01c68000 0x1000>;