aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/taishan.dts
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/dts/taishan.dts
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/dts/taishan.dts')
-rw-r--r--arch/powerpc/boot/dts/taishan.dts8
1 files changed, 4 insertions, 4 deletions
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>;