PERFORCE change 154446 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=154446

Change 154446 by sam at sam_ebb on 2008/12/10 17:39:28

	Fix mac address confusion: ixp425 has B+C MAC's, ixp435 has A+C
	MAC's; we map mac's to the same two va windows

Affected files ...

.. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425reg.h#7 edit

Differences ...

==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425reg.h#7 (text+ko) ====

@@ -132,13 +132,11 @@
 #define	IXP425_NPE_A_OFFSET	0x00006000UL	/* Not User Programmable */
 #define	IXP425_NPE_B_OFFSET	0x00007000UL	/* Not User Programmable */
 #define	IXP425_NPE_C_OFFSET	0x00008000UL	/* Not User Programmable */
-#define	IXP425_MAC_A_OFFSET	0x00009000UL
-#define	IXP425_MAC_B_OFFSET	0x0000a000UL
+#define	IXP425_MAC_B_OFFSET	0x00009000UL	/* Ethernet MAC on NPE-B */
+#define	IXP425_MAC_C_OFFSET	0x0000a000UL	/* Ethernet MAC on NPE-C */
 #define	IXP425_USB_OFFSET	0x0000b000UL
+#define	IXP435_MAC_A_OFFSET	0x0000c000UL	/* Ethernet MAC on NPE-A */
 
-#define	IXP435_MAC_C_OFFSET	0x0000a000UL	/* Ethernet MAC on NPE C */
-#define	IXP435_MAC_A_OFFSET	0x0000c000UL	/* Ethernet MAC on NPE A */
-
 #define	IXP425_REG_SIZE		0x1000
 
 /*
@@ -613,22 +611,17 @@
 #define IXP425_NPE_C_VBASE	(IXP425_IO_VBASE + IXP425_NPE_C_OFFSET)
 #define IXP425_NPE_C_SIZE	0x1000		/* Actually only 256 bytes */
 
-#define IXP425_MAC_A_HWBASE	(IXP425_IO_HWBASE + IXP425_MAC_A_OFFSET)
-#define IXP425_MAC_A_VBASE	(IXP425_IO_VBASE + IXP425_MAC_A_OFFSET)
-#define IXP425_MAC_A_SIZE	0x1000		/* Actually only 256 bytes */
-
 #define IXP425_MAC_B_HWBASE	(IXP425_IO_HWBASE + IXP425_MAC_B_OFFSET)
 #define IXP425_MAC_B_VBASE	(IXP425_IO_VBASE + IXP425_MAC_B_OFFSET)
 #define IXP425_MAC_B_SIZE	0x1000 		/* Actually only 256 bytes */
 
-/* NB: IXP435 MAC's are mapped differently */
+#define IXP425_MAC_C_HWBASE	(IXP425_IO_HWBASE + IXP425_MAC_C_OFFSET)
+#define IXP425_MAC_C_VBASE	(IXP425_IO_VBASE + IXP425_MAC_C_OFFSET)
+#define IXP425_MAC_C_SIZE	0x1000		/* Actually only 256 bytes */
+
 #define IXP435_MAC_A_HWBASE	(IXP425_IO_HWBASE + IXP435_MAC_A_OFFSET)
-#define IXP435_MAC_A_VBASE	(IXP425_IO_VBASE + IXP425_MAC_A_OFFSET)
-#define IXP435_MAC_A_SIZE	0x1000		/* Actually only 256 bytes */
-
-#define IXP435_MAC_C_HWBASE	(IXP425_IO_HWBASE + IXP435_MAC_C_OFFSET)
-#define IXP435_MAC_C_VBASE	(IXP425_IO_VBASE + IXP425_MAC_B_OFFSET)
-#define IXP435_MAC_C_SIZE	0x1000 		/* Actually only 256 bytes */
+#define IXP435_MAC_A_VBASE	(IXP425_IO_VBASE + IXP435_MAC_A_OFFSET)
+#define IXP435_MAC_A_SIZE	0x1000 		/* Actually only 256 bytes */
 
 /*
  * Expansion Bus Data Space.