Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / mpc8536ds.dts

diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts
index 93fdd99901b6e61c9909542ec30338df5b0d8cd8..35db1e5440c7631928562337ac2f043f82e6f55a 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8536ds.dts
+++ b/arch/powerpc/boot/dts/mpc8536ds.dts
@@ -109,7 +109,7 @@
                                reg = <0x0 0x80>;
                                cell-index = <0>;
                                interrupt-parent = <&mpic>;
-                               interrupts = <14 0x2>;
+                               interrupts = <20 2>;
                        };
                        dma-channel@80 {
                                compatible = "fsl,mpc8536-dma-channel",
@@ -117,7 +117,7 @@
                                reg = <0x80 0x80>;
                                cell-index = <1>;
                                interrupt-parent = <&mpic>;
-                               interrupts = <15 0x2>;
+                               interrupts = <21 2>;
                        };
                        dma-channel@100 {
                                compatible = "fsl,mpc8536-dma-channel",
@@ -125,7 +125,7 @@
                                reg = <0x100 0x80>;
                                cell-index = <2>;
                                interrupt-parent = <&mpic>;
-                               interrupts = <16 0x2>;
+                               interrupts = <22 2>;
                        };
                        dma-channel@180 {
                                compatible = "fsl,mpc8536-dma-channel",
@@ -133,7 +133,7 @@
                                reg = <0x180 0x80>;
                                cell-index = <3>;
                                interrupt-parent = <&mpic>;
-                               interrupts = <17 0x2>;
+                               interrupts = <23 2>;
                        };
                };
 
@@ -180,7 +180,7 @@
                enet0: ethernet@24000 {
                        cell-index = <0>;
                        device_type = "network";
-                       model = "TSEC";
+                       model = "eTSEC";
                        compatible = "gianfar";
                        reg = <0x24000 0x1000>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
@@ -193,7 +193,7 @@
                enet1: ethernet@26000 {
                        cell-index = <1>;
                        device_type = "network";
-                       model = "TSEC";
+                       model = "eTSEC";
                        compatible = "gianfar";
                        reg = <0x26000 0x1000>;
                        local-mac-address = [ 00 00 00 00 00 00 ];