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

• Lines: 73
• Date: Wed Nov 8 23:00:35 2000
• Orig file: v2.2.17/drivers/net/gmac.h
• Orig date: Sat Sep 9 18:42:38 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/net/gmac.h linux/drivers/net/gmac.h
@@ -730,8 +730,9 @@
  */
 
 /* Supported PHYs (phy_type field ) */
-#define PHY_B5400	5400
-#define PHY_B5201	5201
+#define PHY_B5400	0x5400
+#define PHY_B5201	0x5201
+#define PHY_LXT971	0x0971
 #define PHY_UNKNOWN	0
 
 /* Identification (for multi-PHY) */
@@ -745,6 +746,11 @@
 #define MII_BCM5400_REV                         0x01
 #define MII_BCM5400_ID                          ((MII_BCM5400_OUI << 10) | (MII_BCM5400_MODEL << 4))
 #define MII_BCM5400_MASK                        0xfffffff0
+#define MII_LXT971_OUI                          0x0004de
+#define MII_LXT971_MODEL                        0x0e
+#define MII_LXT971_REV                          0x00
+#define MII_LXT971_ID                           ((MII_LXT971_OUI << 10) | (MII_LXT971_MODEL << 4))
+#define MII_LXT971_MASK                         0xfffffff0
 
 /* BCM5201 AUX STATUS register */
 #define MII_BCM5201_AUXCTLSTATUS		0x18
@@ -764,6 +770,26 @@
 #define MII_BCM5201_MULTIPHY_SERIALMODE         0x0002
 #define MII_BCM5201_MULTIPHY_SUPERISOLATE       0x0008
 
+/* MII BCM5400 1000-BASET Control register */
+#define MII_BCM5400_GB_CONTROL			0x09
+#define MII_BCM5400_GB_CONTROL_FULLDUPLEXCAP	0x0200
+
+/* MII BCM5400 AUXCONTROL register */
+#define MII_BCM5400_AUXCONTROL                  0x18
+#define MII_BCM5400_AUXCONTROL_PWR10BASET       0x0004
+
+/* MII BCM5400 AUXSTATUS register */
+#define MII_BCM5400_AUXSTATUS                   0x19
+#define MII_BCM5400_AUXSTATUS_LINKMODE_MASK     0x0700
+#define MII_BCM5400_AUXSTATUS_LINKMODE_SHIFT    8  
+
+/* MII LXT971 STATUS2 register */
+#define MII_LXT971_STATUS2			0x11
+#define MII_LXT971_STATUS2_SPEED		0x4000
+#define MII_LXT971_STATUS2_LINK			0x0400
+#define MII_LXT971_STATUS2_FULLDUPLEX		0x0200
+#define MII_LXT971_STATUS2_AUTONEG_COMPLETE	0x0080
+
 
 
 	/*
@@ -829,8 +855,8 @@
 	 
 struct gmac {
 	volatile unsigned int		*regs;	/* hardware registers, virtual addr */
-	volatile unsigned int		*sysregs;
 	struct device			*dev;
+	struct device_node		*of_node;
 	unsigned long			tx_desc_page;	/* page for DMA descriptors */
 	unsigned long			rx_desc_page;	/* page for DMA descriptors */
 	volatile struct			gmac_dma_desc *rxring;
@@ -845,9 +871,11 @@
 	int				phy_type;
 	int				phy_status;	/* Cached PHY status */
 	int				full_duplex;	/* Current set to full duplex */
+	int				gigabit;	/* Current set to 1000BT */
 	struct net_device_stats		stats;
 	u8				pci_bus;
 	u8				pci_devfn;
+	spinlock_t			lock;
 	int				opened;
 };