Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into next/soc

[karo-tx-linux.git] / arch / arm / boot / dts / armada-370-xp.dtsi

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index e984ce6bb33f0742e61c4815dabf50175e27a9e8..1de2dae0fdae6f6353169dc423d75e07d4f65f6f 100644 (file)
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -138,10 +138,8 @@
                        };
 
                        timer@20300 {
-                               compatible = "marvell,armada-370-xp-timer";
                                reg = <0x20300 0x30>, <0x21040 0x30>;
                                interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
-                               clocks = <&coreclk 2>;
                        };
 
                        sata@a0000 {