Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / at91sam9261.dtsi

diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index 6687601..ddfc63b 100644 (file)
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -80,7 +80,7 @@
                        status = "disabled";
                };
 
-               fb0: fb@0x00600000 {
+               fb0: fb@600000 {
                        compatible = "atmel,at91sam9261-lcdc";
                        reg = <0x00600000 0x1000>;
                        interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
@@ -125,7 +125,9 @@
                        ranges;
 
                        tcb0: timer@fffa0000 {
-                               compatible = "atmel,at91rm9200-tcb";
+                               compatible = "atmel,at91rm9200-tcb", "simple-mfd", "syscon";
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <0xfffa0000 0x100>;
                                interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>,
                                             <18 IRQ_TYPE_LEVEL_HIGH 0>,