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

[pandora-kernel.git] / arch / arm / boot / dts / vf610.dtsi

diff --git a/arch/arm/boot/dts/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi
index 73355dd..6cc314e 100644 (file)
--- a/arch/arm/boot/dts/vf610.dtsi
+++ b/arch/arm/boot/dts/vf610.dtsi
@@ -371,6 +371,19 @@
                                status = "disabled";
                        };
 
+                       ftm: ftm@400b8000 {
+                               compatible = "fsl,ftm-timer";
+                               reg = <0x400b8000 0x1000 0x400b9000 0x1000>;
+                               interrupts = <0 44 IRQ_TYPE_LEVEL_HIGH>;
+                               clock-names = "ftm-evt", "ftm-src",
+                                       "ftm-evt-counter-en", "ftm-src-counter-en";
+                               clocks = <&clks VF610_CLK_FTM2>,
+                                       <&clks VF610_CLK_FTM3>,
+                                       <&clks VF610_CLK_FTM2_EXT_FIX_EN>,
+                                       <&clks VF610_CLK_FTM3_EXT_FIX_EN>;
+                               status = "disabled";
+                       };
+
                        fec0: ethernet@400d0000 {
                                compatible = "fsl,mvf600-fec";
                                reg = <0x400d0000 0x1000>;