diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-07-01 00:24:14 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-07-14 08:55:29 -0400 |
commit | 0fe9b1ea60bc209c8c87afcbb1c2ec0b28835aa4 (patch) | |
tree | 579b62a337b195669943a782b853e5c0e019f401 /arch/powerpc | |
parent | 11c2d8174ed3dc4f1971564732689b4a39129702 (diff) |
powerpc/85xx: Fix KSI8560 .dts
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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/boot/dts/ksi8560.dts | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/powerpc/boot/dts/ksi8560.dts b/arch/powerpc/boot/dts/ksi8560.dts index fd5804398417..49737589ffc8 100644 --- a/arch/powerpc/boot/dts/ksi8560.dts +++ b/arch/powerpc/boot/dts/ksi8560.dts | |||
@@ -59,7 +59,7 @@ | |||
59 | memory-controller@2000 { | 59 | memory-controller@2000 { |
60 | compatible = "fsl,8540-memory-controller"; | 60 | compatible = "fsl,8540-memory-controller"; |
61 | reg = <0x2000 0x1000>; | 61 | reg = <0x2000 0x1000>; |
62 | interrupt-parent = <&MPIC>; | 62 | interrupt-parent = <&mpic>; |
63 | interrupts = <0x12 0x2>; | 63 | interrupts = <0x12 0x2>; |
64 | }; | 64 | }; |
65 | 65 | ||
@@ -68,7 +68,7 @@ | |||
68 | reg = <0x20000 0x1000>; | 68 | reg = <0x20000 0x1000>; |
69 | cache-line-size = <0x20>; /* 32 bytes */ | 69 | cache-line-size = <0x20>; /* 32 bytes */ |
70 | cache-size = <0x40000>; /* L2, 256K */ | 70 | cache-size = <0x40000>; /* L2, 256K */ |
71 | interrupt-parent = <&MPIC>; | 71 | interrupt-parent = <&mpic>; |
72 | interrupts = <0x10 0x2>; | 72 | interrupts = <0x10 0x2>; |
73 | }; | 73 | }; |
74 | 74 | ||
@@ -79,7 +79,7 @@ | |||
79 | compatible = "fsl-i2c"; | 79 | compatible = "fsl-i2c"; |
80 | reg = <0x3000 0x100>; | 80 | reg = <0x3000 0x100>; |
81 | interrupts = <0x2b 0x2>; | 81 | interrupts = <0x2b 0x2>; |
82 | interrupt-parent = <&MPIC>; | 82 | interrupt-parent = <&mpic>; |
83 | dfsrr; | 83 | dfsrr; |
84 | }; | 84 | }; |
85 | 85 | ||
@@ -131,13 +131,13 @@ | |||
131 | reg = <0x24520 0x20>; | 131 | reg = <0x24520 0x20>; |
132 | 132 | ||
133 | PHY1: ethernet-phy@1 { | 133 | PHY1: ethernet-phy@1 { |
134 | interrupt-parent = <&MPIC>; | 134 | interrupt-parent = <&mpic>; |
135 | reg = <0x1>; | 135 | reg = <0x1>; |
136 | device_type = "ethernet-phy"; | 136 | device_type = "ethernet-phy"; |
137 | }; | 137 | }; |
138 | 138 | ||
139 | PHY2: ethernet-phy@2 { | 139 | PHY2: ethernet-phy@2 { |
140 | interrupt-parent = <&MPIC>; | 140 | interrupt-parent = <&mpic>; |
141 | reg = <0x2>; | 141 | reg = <0x2>; |
142 | device_type = "ethernet-phy"; | 142 | device_type = "ethernet-phy"; |
143 | }; | 143 | }; |
@@ -151,7 +151,7 @@ | |||
151 | /* Mac address filled in by bootwrapper */ | 151 | /* Mac address filled in by bootwrapper */ |
152 | local-mac-address = [ 00 00 00 00 00 00 ]; | 152 | local-mac-address = [ 00 00 00 00 00 00 ]; |
153 | interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>; | 153 | interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>; |
154 | interrupt-parent = <&MPIC>; | 154 | interrupt-parent = <&mpic>; |
155 | phy-handle = <&PHY1>; | 155 | phy-handle = <&PHY1>; |
156 | }; | 156 | }; |
157 | 157 | ||
@@ -163,11 +163,11 @@ | |||
163 | /* Mac address filled in by bootwrapper */ | 163 | /* Mac address filled in by bootwrapper */ |
164 | local-mac-address = [ 00 00 00 00 00 00 ]; | 164 | local-mac-address = [ 00 00 00 00 00 00 ]; |
165 | interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>; | 165 | interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>; |
166 | interrupt-parent = <&MPIC>; | 166 | interrupt-parent = <&mpic>; |
167 | phy-handle = <&PHY2>; | 167 | phy-handle = <&PHY2>; |
168 | }; | 168 | }; |
169 | 169 | ||
170 | MPIC: pic@40000 { | 170 | mpic: pic@40000 { |
171 | #address-cells = <0>; | 171 | #address-cells = <0>; |
172 | #interrupt-cells = <2>; | 172 | #interrupt-cells = <2>; |
173 | interrupt-controller; | 173 | interrupt-controller; |
@@ -206,7 +206,7 @@ | |||
206 | #interrupt-cells = <2>; | 206 | #interrupt-cells = <2>; |
207 | interrupt-controller; | 207 | interrupt-controller; |
208 | interrupts = <0x2e 0x2>; | 208 | interrupts = <0x2e 0x2>; |
209 | interrupt-parent = <&MPIC>; | 209 | interrupt-parent = <&mpic>; |
210 | reg = <0x90c00 0x80>; | 210 | reg = <0x90c00 0x80>; |
211 | compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic"; | 211 | compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic"; |
212 | }; | 212 | }; |
@@ -244,7 +244,7 @@ | |||
244 | fsl,mdc-pin = <25>; | 244 | fsl,mdc-pin = <25>; |
245 | 245 | ||
246 | PHY0: ethernet-phy@0 { | 246 | PHY0: ethernet-phy@0 { |
247 | interrupt-parent = <&MPIC>; | 247 | interrupt-parent = <&mpic>; |
248 | reg = <0x0>; | 248 | reg = <0x0>; |
249 | device_type = "ethernet-phy"; | 249 | device_type = "ethernet-phy"; |
250 | }; | 250 | }; |