Merge branch 'drm-next-4.14' of git://people.freedesktop.org/~agd5f/linux into drm...

[linux-2.6-block.git] / arch / arm / boot / dts / aspeed-g5.dtsi

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 1e6c701da853c2c9a3eddbf52b1e2efae22d3ea9..9cffe347b828a7fd3b85b85e01c0b0fcda65a464 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -993,12 +993,10 @@
                        };
 
                        timer: timer@1e782000 {
+                               /* This timer is a Faraday FTTMR010 derivative */
                                compatible = "aspeed,ast2400-timer";
                                reg = <0x1e782000 0x90>;
-                               // The moxart_timer driver registers only one
-                               // interrupt and assumes it's for timer 1
-                               //interrupts = <16 17 18 35 36 37 38 39>;
-                               interrupts = <16>;
+                               interrupts = <16 17 18 35 36 37 38 39>;
                                clocks = <&clk_apb>;
                                clock-names = "PCLK";
                        };