summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/mpc8536ds.dts
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-21 15:49:55 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-21 15:49:55 +1100
commit84dfcb4b318463cd4883b6a19937824f49aee564 (patch)
tree56a96898bff3a2bd3a65abb28a8c018d28db85e8 /arch/powerpc/boot/dts/mpc8536ds.dts
parent34d81f858a3bdec568bf08c4feb997ccd3d40b94 (diff)
parent672e806ee103c1709bcdcafabe65ba9c8ab5a63d (diff)
Merge commit 'kumar/kumar-for-2.6.28'
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8536ds.dts')
-rw-r--r--arch/powerpc/boot/dts/mpc8536ds.dts12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts
index 93fdd99901b..35db1e5440c 100644
--- 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 ];