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

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sama5d3_tcb1.dtsi

diff --git a/arch/arm/boot/dts/sama5d3_tcb1.dtsi b/arch/arm/boot/dts/sama5d3_tcb1.dtsi
index 801f9745e82f1cd06163b1af76d37ab6a5c1b175..cb30bdb1a9ca15b3361cf86e79cb0aaf2cc11360 100644 (file)
--- a/arch/arm/boot/dts/sama5d3_tcb1.dtsi
+++ b/arch/arm/boot/dts/sama5d3_tcb1.dtsi
@@ -28,7 +28,9 @@
                        };
 
                        tcb1: timer@f8014000 {
-                               compatible = "atmel,at91sam9x5-tcb";
+                               compatible = "atmel,at91sam9x5-tcb", "simple-mfd", "syscon";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <0xf8014000 0x100>;
                                interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;
                                clocks = <&tcb1_clk>, <&clk32k>;