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

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

diff --git a/arch/arm/boot/dts/moxart.dtsi b/arch/arm/boot/dts/moxart.dtsi
index e86f8c905ac57ba1bb01af25ca98e785b640b4b6..1f4c795d3f7210223d7cdab4b5e430affa133a35 100644 (file)
--- a/arch/arm/boot/dts/moxart.dtsi
+++ b/arch/arm/boot/dts/moxart.dtsi
@@ -58,10 +58,11 @@
                };
 
                timer: timer@98400000 {
-                       compatible = "moxa,moxart-timer";
+                       compatible = "moxa,moxart-timer", "faraday,fttmr010";
                        reg = <0x98400000 0x42>;
                        interrupts = <19 IRQ_TYPE_EDGE_FALLING>;
                        clocks = <&clk_apb>;
+                       clock-names = "PCLK";
                };
 
                gpio: gpio@98700000 {