Merge branch 'master' of ../mmc

[pandora-kernel.git] / arch / powerpc / boot / dts / tqm5200.dts

diff --git a/arch/powerpc/boot/dts/tqm5200.dts b/arch/powerpc/boot/dts/tqm5200.dts
index 773a68e..906302e 100644 (file)
--- a/arch/powerpc/boot/dts/tqm5200.dts
+++ b/arch/powerpc/boot/dts/tqm5200.dts
@@ -70,6 +70,20 @@
                        fsl,has-wdt;
                };
 
+               can@900 {
+                       compatible = "fsl,mpc5200-mscan";
+                       interrupts = <2 17 0>;
+                       interrupt-parent = <&mpc5200_pic>;
+                       reg = <0x900 0x80>;
+               };
+
+               can@980 {
+                       compatible = "fsl,mpc5200-mscan";
+                       interrupts = <2 18 0>;
+                       interrupt-parent = <&mpc5200_pic>;
+                       reg = <0x980 0x80>;
+               };
+
                gpio@b00 {
                        compatible = "fsl,mpc5200-gpio";
                        reg = <0xb00 0x40>;
@@ -167,7 +181,6 @@
                        fsl5200-clocking;
 
                         rtc@68 {
-                               device_type = "rtc";
                                compatible = "dallas,ds1307";
                                reg = <0x68>;
                        };