Skip to content

Commit

Permalink
powerpc/85xx: Fix KSI8560 .dts
Browse files Browse the repository at this point in the history
Rename MPIC label to mpic to match all other 85xx .dts and to fix compile
issue introduced by addition of the DMA node.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Kumar Gala committed Jul 14, 2008
1 parent 11c2d81 commit 0fe9b1e
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions arch/powerpc/boot/dts/ksi8560.dts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
memory-controller@2000 {
compatible = "fsl,8540-memory-controller";
reg = <0x2000 0x1000>;
interrupt-parent = <&MPIC>;
interrupt-parent = <&mpic>;
interrupts = <0x12 0x2>;
};

Expand All @@ -68,7 +68,7 @@
reg = <0x20000 0x1000>;
cache-line-size = <0x20>; /* 32 bytes */
cache-size = <0x40000>; /* L2, 256K */
interrupt-parent = <&MPIC>;
interrupt-parent = <&mpic>;
interrupts = <0x10 0x2>;
};

Expand All @@ -79,7 +79,7 @@
compatible = "fsl-i2c";
reg = <0x3000 0x100>;
interrupts = <0x2b 0x2>;
interrupt-parent = <&MPIC>;
interrupt-parent = <&mpic>;
dfsrr;
};

Expand Down Expand Up @@ -131,13 +131,13 @@
reg = <0x24520 0x20>;

PHY1: ethernet-phy@1 {
interrupt-parent = <&MPIC>;
interrupt-parent = <&mpic>;
reg = <0x1>;
device_type = "ethernet-phy";
};

PHY2: ethernet-phy@2 {
interrupt-parent = <&MPIC>;
interrupt-parent = <&mpic>;
reg = <0x2>;
device_type = "ethernet-phy";
};
Expand All @@ -151,7 +151,7 @@
/* Mac address filled in by bootwrapper */
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
interrupt-parent = <&MPIC>;
interrupt-parent = <&mpic>;
phy-handle = <&PHY1>;
};

Expand All @@ -163,11 +163,11 @@
/* Mac address filled in by bootwrapper */
local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
interrupt-parent = <&MPIC>;
interrupt-parent = <&mpic>;
phy-handle = <&PHY2>;
};

MPIC: pic@40000 {
mpic: pic@40000 {
#address-cells = <0>;
#interrupt-cells = <2>;
interrupt-controller;
Expand Down Expand Up @@ -206,7 +206,7 @@
#interrupt-cells = <2>;
interrupt-controller;
interrupts = <0x2e 0x2>;
interrupt-parent = <&MPIC>;
interrupt-parent = <&mpic>;
reg = <0x90c00 0x80>;
compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
};
Expand Down Expand Up @@ -244,7 +244,7 @@
fsl,mdc-pin = <25>;

PHY0: ethernet-phy@0 {
interrupt-parent = <&MPIC>;
interrupt-parent = <&mpic>;
reg = <0x0>;
device_type = "ethernet-phy";
};
Expand Down

0 comments on commit 0fe9b1e

Please sign in to comment.