patch-2.4.10 linux/drivers/net/gmac.h

Next file: linux/drivers/net/gt96100eth.c
Previous file: linux/drivers/net/gmac.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/drivers/net/gmac.h linux/drivers/net/gmac.h
@@ -667,18 +667,18 @@
 /*
 ** MII Management Control Register
 */
-#define MII_CR_RST  0x8000         /* RESET the PHY chip */
-#define MII_CR_LPBK 0x4000         /* Loopback enable */
-#define MII_CR_SPD  0x2000         /* 0: 10Mb/s; 1: 100Mb/s */
-#define MII_CR_10   0x0000         /* Set 10Mb/s */
-#define MII_CR_100  0x2000         /* Set 100Mb/s */
-#define MII_CR_ASSE 0x1000         /* Auto Speed Select Enable */
-#define MII_CR_PD   0x0800         /* Power Down */
-#define MII_CR_ISOL 0x0400         /* Isolate Mode */
-#define MII_CR_RAN  0x0200         /* Restart Auto Negotiation */
-#define MII_CR_FDM  0x0100         /* Full Duplex Mode */
-#define MII_CR_CTE  0x0080         /* Collision Test Enable */
-
+#define MII_CR_RST	 0x8000         /* RESET the PHY chip */
+#define MII_CR_LPBK	 0x4000         /* Loopback enable */
+#define MII_CR_SPD 	 0x2000         /* 0: 10Mb/s; 1: 100Mb/s */
+#define MII_CR_10  	 0x0000         /* Set 10Mb/s */
+#define MII_CR_100 	 0x2000         /* Set 100Mb/s */
+#define MII_CR_ASSE	 0x1000         /* Auto Speed Select Enable */
+#define MII_CR_PD  	 0x0800         /* Power Down */
+#define MII_CR_ISOL	 0x0400         /* Isolate Mode */
+#define MII_CR_RAN 	 0x0200         /* Restart Auto Negotiation */
+#define MII_CR_FDM 	 0x0100         /* Full Duplex Mode */
+#define MII_CR_CTE 	 0x0080         /* Collision Test Enable */
+#define MII_CR_SPEEDSEL2 0x0040		/* Speed selection 2 on BCM */
 /*
 ** MII Management Status Register
 */
@@ -739,7 +739,9 @@
 /* Supported PHYs (phy_type field ) */
 #define PHY_B5400	0x5400
 #define PHY_B5401	0x5401
+#define PHY_B5411	0x5411
 #define PHY_B5201	0x5201
+#define PHY_B5221	0x5221
 #define PHY_LXT971	0x0971
 #define PHY_UNKNOWN	0
 
@@ -764,6 +766,11 @@
 #define MII_BCM5401_REV                         0x01
 #define MII_BCM5401_ID                          ((MII_BCM5401_OUI << 10) | (MII_BCM5401_MODEL << 4))
 #define MII_BCM5401_MASK                        0xfffffff0
+#define MII_BCM5411_OUI                         0x000818
+#define MII_BCM5411_MODEL                       0x07
+#define MII_BCM5411_REV                         0x01
+#define MII_BCM5411_ID                          ((MII_BCM5411_OUI << 10) | (MII_BCM5411_MODEL << 4))
+#define MII_BCM5411_MASK                        0xfffffff0
 #define MII_LXT971_OUI                          0x0004de
 #define MII_LXT971_MODEL                        0x0e
 #define MII_LXT971_REV                          0x00

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)