aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot
diff options
context:
space:
mode:
authorGrant Erickson <gerickson@nuovations.com>2008-07-07 18:03:11 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-09 02:30:46 -0400
commit05781ccd74c63c6c8567f99101587d5c07c163e0 (patch)
treebd1e666433674363e5d0819c08afae87e7105995 /arch/powerpc/boot
parent801eb73f45371accc78ca9d6d22d647eeb722c11 (diff)
ibm_newemac: Parameterize EMAC Multicast Match Handling
Various instances of the EMAC core have varying: 1) number of address match slots, 2) width of the registers for handling address match slots, 3) number of registers for handling address match slots and 4) base offset for those registers. As the driver stands today, it assumes that all EMACs have 4 IAHT and GAHT 32-bit registers, starting at offset 0x30 from the register base, with only 16-bits of each used for a total of 64 match slots. The 405EX(r) and 460EX now use the EMAC4SYNC core rather than the EMAC4 core. This core has 8 IAHT and GAHT registers, starting at offset 0x80 from the register base, with ALL 32-bits of each used for a total of 256 match slots. This adds a new compatible device tree entry "emac4sync" and a new, related feature flag "EMAC_FTR_EMAC4SYNC" along with a series of macros and inlines which supply the appropriate parameterized value based on the presence or absence of the EMAC4SYNC feature. The code has further been reworked where appropriate to use those macros and inlines. In addition, the register size passed to ioremap is now taken from the device tree: c4 for EMAC4SYNC cores 74 for EMAC4 cores 70 for EMAC cores rather than sizeof (emac_regs). Finally, the device trees have been updated with the appropriate compatible entries and resource sizes. This has been tested on an AMCC Haleakala board such that: 1) inbound ICMP requests to 'haleakala.local' via MDNS from both Mac OS X 10.4.11 and Ubuntu 8.04 systems as well as 2) outbound ICMP requests from 'haleakala.local' to those same systems in the '.local' domain via MDNS now work. Signed-off-by: Grant Erickson <gerickson@nuovations.com> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r--arch/powerpc/boot/dts/canyonlands.dts8
-rw-r--r--arch/powerpc/boot/dts/glacier.dts8
-rw-r--r--arch/powerpc/boot/dts/haleakala.dts4
-rw-r--r--arch/powerpc/boot/dts/katmai.dts2
-rw-r--r--arch/powerpc/boot/dts/kilauea.dts8
-rw-r--r--arch/powerpc/boot/dts/makalu.dts8
-rw-r--r--arch/powerpc/boot/dts/rainier.dts4
-rw-r--r--arch/powerpc/boot/dts/sequoia.dts4
-rw-r--r--arch/powerpc/boot/dts/taishan.dts8
9 files changed, 27 insertions, 27 deletions
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index f9fe03252150..79fe412c11c9 100644
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -266,7 +266,7 @@
266 266
267 EMAC0: ethernet@ef600e00 { 267 EMAC0: ethernet@ef600e00 {
268 device_type = "network"; 268 device_type = "network";
269 compatible = "ibm,emac-460ex", "ibm,emac4"; 269 compatible = "ibm,emac-460ex", "ibm,emac4sync";
270 interrupt-parent = <&EMAC0>; 270 interrupt-parent = <&EMAC0>;
271 interrupts = <0x0 0x1>; 271 interrupts = <0x0 0x1>;
272 #interrupt-cells = <1>; 272 #interrupt-cells = <1>;
@@ -274,7 +274,7 @@
274 #size-cells = <0>; 274 #size-cells = <0>;
275 interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4 275 interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4
276 /*Wake*/ 0x1 &UIC2 0x14 0x4>; 276 /*Wake*/ 0x1 &UIC2 0x14 0x4>;
277 reg = <0xef600e00 0x00000070>; 277 reg = <0xef600e00 0x000000c4>;
278 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 278 local-mac-address = [000000000000]; /* Filled in by U-Boot */
279 mal-device = <&MAL0>; 279 mal-device = <&MAL0>;
280 mal-tx-channel = <0>; 280 mal-tx-channel = <0>;
@@ -295,7 +295,7 @@
295 295
296 EMAC1: ethernet@ef600f00 { 296 EMAC1: ethernet@ef600f00 {
297 device_type = "network"; 297 device_type = "network";
298 compatible = "ibm,emac-460ex", "ibm,emac4"; 298 compatible = "ibm,emac-460ex", "ibm,emac4sync";
299 interrupt-parent = <&EMAC1>; 299 interrupt-parent = <&EMAC1>;
300 interrupts = <0x0 0x1>; 300 interrupts = <0x0 0x1>;
301 #interrupt-cells = <1>; 301 #interrupt-cells = <1>;
@@ -303,7 +303,7 @@
303 #size-cells = <0>; 303 #size-cells = <0>;
304 interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4 304 interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4
305 /*Wake*/ 0x1 &UIC2 0x15 0x4>; 305 /*Wake*/ 0x1 &UIC2 0x15 0x4>;
306 reg = <0xef600f00 0x00000070>; 306 reg = <0xef600f00 0x000000c4>;
307 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 307 local-mac-address = [000000000000]; /* Filled in by U-Boot */
308 mal-device = <&MAL0>; 308 mal-device = <&MAL0>;
309 mal-tx-channel = <1>; 309 mal-tx-channel = <1>;
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index 463650c5f61d..24cf0dba120c 100644
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -283,7 +283,7 @@
283 #size-cells = <0>; 283 #size-cells = <0>;
284 interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4 284 interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4
285 /*Wake*/ 0x1 &UIC2 0x14 0x4>; 285 /*Wake*/ 0x1 &UIC2 0x14 0x4>;
286 reg = <0xef600e00 0x00000070>; 286 reg = <0xef600e00 0x00000074>;
287 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 287 local-mac-address = [000000000000]; /* Filled in by U-Boot */
288 mal-device = <&MAL0>; 288 mal-device = <&MAL0>;
289 mal-tx-channel = <0>; 289 mal-tx-channel = <0>;
@@ -312,7 +312,7 @@
312 #size-cells = <0>; 312 #size-cells = <0>;
313 interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4 313 interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4
314 /*Wake*/ 0x1 &UIC2 0x15 0x4>; 314 /*Wake*/ 0x1 &UIC2 0x15 0x4>;
315 reg = <0xef600f00 0x00000070>; 315 reg = <0xef600f00 0x00000074>;
316 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 316 local-mac-address = [000000000000]; /* Filled in by U-Boot */
317 mal-device = <&MAL0>; 317 mal-device = <&MAL0>;
318 mal-tx-channel = <1>; 318 mal-tx-channel = <1>;
@@ -342,7 +342,7 @@
342 #size-cells = <0>; 342 #size-cells = <0>;
343 interrupt-map = </*Status*/ 0x0 &UIC2 0x12 0x4 343 interrupt-map = </*Status*/ 0x0 &UIC2 0x12 0x4
344 /*Wake*/ 0x1 &UIC2 0x16 0x4>; 344 /*Wake*/ 0x1 &UIC2 0x16 0x4>;
345 reg = <0xef601100 0x00000070>; 345 reg = <0xef601100 0x00000074>;
346 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 346 local-mac-address = [000000000000]; /* Filled in by U-Boot */
347 mal-device = <&MAL0>; 347 mal-device = <&MAL0>;
348 mal-tx-channel = <2>; 348 mal-tx-channel = <2>;
@@ -370,7 +370,7 @@
370 #size-cells = <0>; 370 #size-cells = <0>;
371 interrupt-map = </*Status*/ 0x0 &UIC2 0x13 0x4 371 interrupt-map = </*Status*/ 0x0 &UIC2 0x13 0x4
372 /*Wake*/ 0x1 &UIC2 0x17 0x4>; 372 /*Wake*/ 0x1 &UIC2 0x17 0x4>;
373 reg = <0xef601200 0x00000070>; 373 reg = <0xef601200 0x00000074>;
374 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 374 local-mac-address = [000000000000]; /* Filled in by U-Boot */
375 mal-device = <&MAL0>; 375 mal-device = <&MAL0>;
376 mal-tx-channel = <3>; 376 mal-tx-channel = <3>;
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
index 2c2fceaabbcd..513bc43a71af 100644
--- a/arch/powerpc/boot/dts/haleakala.dts
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -206,7 +206,7 @@
206 EMAC0: ethernet@ef600900 { 206 EMAC0: ethernet@ef600900 {
207 linux,network-index = <0x0>; 207 linux,network-index = <0x0>;
208 device_type = "network"; 208 device_type = "network";
209 compatible = "ibm,emac-405exr", "ibm,emac4"; 209 compatible = "ibm,emac-405exr", "ibm,emac4sync";
210 interrupt-parent = <&EMAC0>; 210 interrupt-parent = <&EMAC0>;
211 interrupts = <0x0 0x1>; 211 interrupts = <0x0 0x1>;
212 #interrupt-cells = <1>; 212 #interrupt-cells = <1>;
@@ -214,7 +214,7 @@
214 #size-cells = <0>; 214 #size-cells = <0>;
215 interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 215 interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
216 /*Wake*/ 0x1 &UIC1 0x1d 0x4>; 216 /*Wake*/ 0x1 &UIC1 0x1d 0x4>;
217 reg = <0xef600900 0x00000070>; 217 reg = <0xef600900 0x000000c4>;
218 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 218 local-mac-address = [000000000000]; /* Filled in by U-Boot */
219 mal-device = <&MAL0>; 219 mal-device = <&MAL0>;
220 mal-tx-channel = <0>; 220 mal-tx-channel = <0>;
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts
index b94bf61b9bcc..077819bc3cbd 100644
--- a/arch/powerpc/boot/dts/katmai.dts
+++ b/arch/powerpc/boot/dts/katmai.dts
@@ -208,7 +208,7 @@
208 compatible = "ibm,emac-440spe", "ibm,emac4"; 208 compatible = "ibm,emac-440spe", "ibm,emac4";
209 interrupt-parent = <&UIC1>; 209 interrupt-parent = <&UIC1>;
210 interrupts = <0x1c 0x4 0x1d 0x4>; 210 interrupts = <0x1c 0x4 0x1d 0x4>;
211 reg = <0x10000800 0x00000070>; 211 reg = <0x10000800 0x00000074>;
212 local-mac-address = [000000000000]; 212 local-mac-address = [000000000000];
213 mal-device = <&MAL0>; 213 mal-device = <&MAL0>;
214 mal-tx-channel = <0>; 214 mal-tx-channel = <0>;
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index 3ed6a8fee1d5..dececc4b5ff2 100644
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -207,7 +207,7 @@
207 EMAC0: ethernet@ef600900 { 207 EMAC0: ethernet@ef600900 {
208 linux,network-index = <0x0>; 208 linux,network-index = <0x0>;
209 device_type = "network"; 209 device_type = "network";
210 compatible = "ibm,emac-405ex", "ibm,emac4"; 210 compatible = "ibm,emac-405ex", "ibm,emac4sync";
211 interrupt-parent = <&EMAC0>; 211 interrupt-parent = <&EMAC0>;
212 interrupts = <0x0 0x1>; 212 interrupts = <0x0 0x1>;
213 #interrupt-cells = <1>; 213 #interrupt-cells = <1>;
@@ -215,7 +215,7 @@
215 #size-cells = <0>; 215 #size-cells = <0>;
216 interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 216 interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
217 /*Wake*/ 0x1 &UIC1 0x1d 0x4>; 217 /*Wake*/ 0x1 &UIC1 0x1d 0x4>;
218 reg = <0xef600900 0x00000070>; 218 reg = <0xef600900 0x000000c4>;
219 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 219 local-mac-address = [000000000000]; /* Filled in by U-Boot */
220 mal-device = <&MAL0>; 220 mal-device = <&MAL0>;
221 mal-tx-channel = <0>; 221 mal-tx-channel = <0>;
@@ -235,7 +235,7 @@
235 EMAC1: ethernet@ef600a00 { 235 EMAC1: ethernet@ef600a00 {
236 linux,network-index = <0x1>; 236 linux,network-index = <0x1>;
237 device_type = "network"; 237 device_type = "network";
238 compatible = "ibm,emac-405ex", "ibm,emac4"; 238 compatible = "ibm,emac-405ex", "ibm,emac4sync";
239 interrupt-parent = <&EMAC1>; 239 interrupt-parent = <&EMAC1>;
240 interrupts = <0x0 0x1>; 240 interrupts = <0x0 0x1>;
241 #interrupt-cells = <1>; 241 #interrupt-cells = <1>;
@@ -243,7 +243,7 @@
243 #size-cells = <0>; 243 #size-cells = <0>;
244 interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 244 interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4
245 /*Wake*/ 0x1 &UIC1 0x1f 0x4>; 245 /*Wake*/ 0x1 &UIC1 0x1f 0x4>;
246 reg = <0xef600a00 0x00000070>; 246 reg = <0xef600a00 0x000000c4>;
247 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 247 local-mac-address = [000000000000]; /* Filled in by U-Boot */
248 mal-device = <&MAL0>; 248 mal-device = <&MAL0>;
249 mal-tx-channel = <1>; 249 mal-tx-channel = <1>;
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
index 1dfcd7ed199c..945508c7e7d8 100644
--- a/arch/powerpc/boot/dts/makalu.dts
+++ b/arch/powerpc/boot/dts/makalu.dts
@@ -207,7 +207,7 @@
207 EMAC0: ethernet@ef600900 { 207 EMAC0: ethernet@ef600900 {
208 linux,network-index = <0x0>; 208 linux,network-index = <0x0>;
209 device_type = "network"; 209 device_type = "network";
210 compatible = "ibm,emac-405ex", "ibm,emac4"; 210 compatible = "ibm,emac-405ex", "ibm,emac4sync";
211 interrupt-parent = <&EMAC0>; 211 interrupt-parent = <&EMAC0>;
212 interrupts = <0x0 0x1>; 212 interrupts = <0x0 0x1>;
213 #interrupt-cells = <1>; 213 #interrupt-cells = <1>;
@@ -215,7 +215,7 @@
215 #size-cells = <0>; 215 #size-cells = <0>;
216 interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 216 interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
217 /*Wake*/ 0x1 &UIC1 0x1d 0x4>; 217 /*Wake*/ 0x1 &UIC1 0x1d 0x4>;
218 reg = <0xef600900 0x00000070>; 218 reg = <0xef600900 0x000000c4>;
219 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 219 local-mac-address = [000000000000]; /* Filled in by U-Boot */
220 mal-device = <&MAL0>; 220 mal-device = <&MAL0>;
221 mal-tx-channel = <0>; 221 mal-tx-channel = <0>;
@@ -235,7 +235,7 @@
235 EMAC1: ethernet@ef600a00 { 235 EMAC1: ethernet@ef600a00 {
236 linux,network-index = <0x1>; 236 linux,network-index = <0x1>;
237 device_type = "network"; 237 device_type = "network";
238 compatible = "ibm,emac-405ex", "ibm,emac4"; 238 compatible = "ibm,emac-405ex", "ibm,emac4sync";
239 interrupt-parent = <&EMAC1>; 239 interrupt-parent = <&EMAC1>;
240 interrupts = <0x0 0x1>; 240 interrupts = <0x0 0x1>;
241 #interrupt-cells = <1>; 241 #interrupt-cells = <1>;
@@ -243,7 +243,7 @@
243 #size-cells = <0>; 243 #size-cells = <0>;
244 interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 244 interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4
245 /*Wake*/ 0x1 &UIC1 0x1f 0x4>; 245 /*Wake*/ 0x1 &UIC1 0x1f 0x4>;
246 reg = <0xef600a00 0x00000070>; 246 reg = <0xef600a00 0x000000c4>;
247 local-mac-address = [000000000000]; /* Filled in by U-Boot */ 247 local-mac-address = [000000000000]; /* Filled in by U-Boot */
248 mal-device = <&MAL0>; 248 mal-device = <&MAL0>;
249 mal-tx-channel = <1>; 249 mal-tx-channel = <1>;
diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts
index 2afb63a42ea9..9684c80e4093 100644
--- a/arch/powerpc/boot/dts/rainier.dts
+++ b/arch/powerpc/boot/dts/rainier.dts
@@ -265,7 +265,7 @@
265 #size-cells = <0>; 265 #size-cells = <0>;
266 interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 266 interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
267 /*Wake*/ 0x1 &UIC1 0x1d 0x4>; 267 /*Wake*/ 0x1 &UIC1 0x1d 0x4>;
268 reg = <0xef600e00 0x00000070>; 268 reg = <0xef600e00 0x00000074>;
269 local-mac-address = [000000000000]; 269 local-mac-address = [000000000000];
270 mal-device = <&MAL0>; 270 mal-device = <&MAL0>;
271 mal-tx-channel = <0>; 271 mal-tx-channel = <0>;
@@ -294,7 +294,7 @@
294 #size-cells = <0>; 294 #size-cells = <0>;
295 interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 295 interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4
296 /*Wake*/ 0x1 &UIC1 0x1f 0x4>; 296 /*Wake*/ 0x1 &UIC1 0x1f 0x4>;
297 reg = <0xef600f00 0x00000070>; 297 reg = <0xef600f00 0x00000074>;
298 local-mac-address = [000000000000]; 298 local-mac-address = [000000000000];
299 mal-device = <&MAL0>; 299 mal-device = <&MAL0>;
300 mal-tx-channel = <1>; 300 mal-tx-channel = <1>;
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 149dabc55217..72d15f075d34 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -280,7 +280,7 @@
280 #size-cells = <0>; 280 #size-cells = <0>;
281 interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4 281 interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
282 /*Wake*/ 0x1 &UIC1 0x1d 0x4>; 282 /*Wake*/ 0x1 &UIC1 0x1d 0x4>;
283 reg = <0xef600e00 0x00000070>; 283 reg = <0xef600e00 0x00000074>;
284 local-mac-address = [000000000000]; 284 local-mac-address = [000000000000];
285 mal-device = <&MAL0>; 285 mal-device = <&MAL0>;
286 mal-tx-channel = <0>; 286 mal-tx-channel = <0>;
@@ -309,7 +309,7 @@
309 #size-cells = <0>; 309 #size-cells = <0>;
310 interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4 310 interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4
311 /*Wake*/ 0x1 &UIC1 0x1f 0x4>; 311 /*Wake*/ 0x1 &UIC1 0x1f 0x4>;
312 reg = <0xef600f00 0x00000070>; 312 reg = <0xef600f00 0x00000074>;
313 local-mac-address = [000000000000]; 313 local-mac-address = [000000000000];
314 mal-device = <&MAL0>; 314 mal-device = <&MAL0>;
315 mal-tx-channel = <1>; 315 mal-tx-channel = <1>;
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
index d4867ded8699..058438f9629b 100644
--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -287,7 +287,7 @@
287 compatible = "ibm,emac-440gx", "ibm,emac4"; 287 compatible = "ibm,emac-440gx", "ibm,emac4";
288 interrupt-parent = <&UIC1>; 288 interrupt-parent = <&UIC1>;
289 interrupts = <0x1c 0x4 0x1d 0x4>; 289 interrupts = <0x1c 0x4 0x1d 0x4>;
290 reg = <0x40000800 0x00000070>; 290 reg = <0x40000800 0x00000074>;
291 local-mac-address = [000000000000]; // Filled in by zImage 291 local-mac-address = [000000000000]; // Filled in by zImage
292 mal-device = <&MAL0>; 292 mal-device = <&MAL0>;
293 mal-tx-channel = <0>; 293 mal-tx-channel = <0>;
@@ -307,7 +307,7 @@
307 compatible = "ibm,emac-440gx", "ibm,emac4"; 307 compatible = "ibm,emac-440gx", "ibm,emac4";
308 interrupt-parent = <&UIC1>; 308 interrupt-parent = <&UIC1>;
309 interrupts = <0x1e 0x4 0x1f 0x4>; 309 interrupts = <0x1e 0x4 0x1f 0x4>;
310 reg = <0x40000900 0x00000070>; 310 reg = <0x40000900 0x00000074>;
311 local-mac-address = [000000000000]; // Filled in by zImage 311 local-mac-address = [000000000000]; // Filled in by zImage
312 mal-device = <&MAL0>; 312 mal-device = <&MAL0>;
313 mal-tx-channel = <1>; 313 mal-tx-channel = <1>;
@@ -327,7 +327,7 @@
327 compatible = "ibm,emac-440gx", "ibm,emac4"; 327 compatible = "ibm,emac-440gx", "ibm,emac4";
328 interrupt-parent = <&UIC2>; 328 interrupt-parent = <&UIC2>;
329 interrupts = <0x0 0x4 0x1 0x4>; 329 interrupts = <0x0 0x4 0x1 0x4>;
330 reg = <0x40000c00 0x00000070>; 330 reg = <0x40000c00 0x00000074>;
331 local-mac-address = [000000000000]; // Filled in by zImage 331 local-mac-address = [000000000000]; // Filled in by zImage
332 mal-device = <&MAL0>; 332 mal-device = <&MAL0>;
333 mal-tx-channel = <2>; 333 mal-tx-channel = <2>;
@@ -351,7 +351,7 @@
351 compatible = "ibm,emac-440gx", "ibm,emac4"; 351 compatible = "ibm,emac-440gx", "ibm,emac4";
352 interrupt-parent = <&UIC2>; 352 interrupt-parent = <&UIC2>;
353 interrupts = <0x2 0x4 0x3 0x4>; 353 interrupts = <0x2 0x4 0x3 0x4>;
354 reg = <0x40000e00 0x00000070>; 354 reg = <0x40000e00 0x00000074>;
355 local-mac-address = [000000000000]; // Filled in by zImage 355 local-mac-address = [000000000000]; // Filled in by zImage
356 mal-device = <&MAL0>; 356 mal-device = <&MAL0>;
357 mal-tx-channel = <3>; 357 mal-tx-channel = <3>;