diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ipg.c | 11 | ||||
-rw-r--r-- | drivers/net/ipg.h | 10 |
2 files changed, 8 insertions, 13 deletions
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c index 9e228e7d3bef..6b64bc58053f 100644 --- a/drivers/net/ipg.c +++ b/drivers/net/ipg.c | |||
@@ -373,7 +373,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int phy_reg, int val) | |||
373 | } | 373 | } |
374 | } | 374 | } |
375 | 375 | ||
376 | /* Set LED_Mode JES20040127EEPROM */ | ||
377 | static void ipg_set_led_mode(struct net_device *dev) | 376 | static void ipg_set_led_mode(struct net_device *dev) |
378 | { | 377 | { |
379 | struct ipg_nic_private *sp = netdev_priv(dev); | 378 | struct ipg_nic_private *sp = netdev_priv(dev); |
@@ -395,7 +394,6 @@ static void ipg_set_led_mode(struct net_device *dev) | |||
395 | ipg_w32(mode, ASIC_CTRL); | 394 | ipg_w32(mode, ASIC_CTRL); |
396 | } | 395 | } |
397 | 396 | ||
398 | /* Set PHYSet JES20040127EEPROM */ | ||
399 | static void ipg_set_phy_set(struct net_device *dev) | 397 | static void ipg_set_phy_set(struct net_device *dev) |
400 | { | 398 | { |
401 | struct ipg_nic_private *sp = netdev_priv(dev); | 399 | struct ipg_nic_private *sp = netdev_priv(dev); |
@@ -414,7 +412,7 @@ static int ipg_reset(struct net_device *dev, u32 resetflags) | |||
414 | * register as specified by the 'resetflags' input | 412 | * register as specified by the 'resetflags' input |
415 | * parameter. | 413 | * parameter. |
416 | */ | 414 | */ |
417 | void __iomem *ioaddr = ipg_ioaddr(dev); //JES20040127EEPROM: | 415 | void __iomem *ioaddr = ipg_ioaddr(dev); |
418 | unsigned int timeout_count = 0; | 416 | unsigned int timeout_count = 0; |
419 | 417 | ||
420 | IPG_DEBUG_MSG("_reset\n"); | 418 | IPG_DEBUG_MSG("_reset\n"); |
@@ -429,10 +427,10 @@ static int ipg_reset(struct net_device *dev, u32 resetflags) | |||
429 | if (++timeout_count > IPG_AC_RESET_TIMEOUT) | 427 | if (++timeout_count > IPG_AC_RESET_TIMEOUT) |
430 | return -ETIME; | 428 | return -ETIME; |
431 | } | 429 | } |
432 | /* Set LED Mode in Asic Control JES20040127EEPROM */ | 430 | /* Set LED Mode in Asic Control */ |
433 | ipg_set_led_mode(dev); | 431 | ipg_set_led_mode(dev); |
434 | 432 | ||
435 | /* Set PHYSet Register Value JES20040127EEPROM */ | 433 | /* Set PHYSet Register Value */ |
436 | ipg_set_phy_set(dev); | 434 | ipg_set_phy_set(dev); |
437 | return 0; | 435 | return 0; |
438 | } | 436 | } |
@@ -2006,7 +2004,6 @@ static void ipg_set_phy_default_param(unsigned char rev, | |||
2006 | } | 2004 | } |
2007 | } | 2005 | } |
2008 | 2006 | ||
2009 | /* JES20040127EEPROM */ | ||
2010 | static int read_eeprom(struct net_device *dev, int eep_addr) | 2007 | static int read_eeprom(struct net_device *dev, int eep_addr) |
2011 | { | 2008 | { |
2012 | void __iomem *ioaddr = ipg_ioaddr(dev); | 2009 | void __iomem *ioaddr = ipg_ioaddr(dev); |
@@ -2073,7 +2070,7 @@ static int ipg_hw_init(struct net_device *dev) | |||
2073 | unsigned int i; | 2070 | unsigned int i; |
2074 | int rc; | 2071 | int rc; |
2075 | 2072 | ||
2076 | /* Read/Write and Reset EEPROM Value Jesse20040128EEPROM_VALUE */ | 2073 | /* Read/Write and Reset EEPROM Value */ |
2077 | /* Read LED Mode Configuration from EEPROM */ | 2074 | /* Read LED Mode Configuration from EEPROM */ |
2078 | sp->LED_Mode = read_eeprom(dev, 6); | 2075 | sp->LED_Mode = read_eeprom(dev, 6); |
2079 | 2076 | ||
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h index 7e3ccd103630..a328221d7abb 100644 --- a/drivers/net/ipg.h +++ b/drivers/net/ipg.h | |||
@@ -79,7 +79,7 @@ enum ipg_regs { | |||
79 | TX_STATUS = 0x60, | 79 | TX_STATUS = 0x60, |
80 | MAC_CTRL = 0x6c, | 80 | MAC_CTRL = 0x6c, |
81 | VLAN_TAG = 0x70, // Unused | 81 | VLAN_TAG = 0x70, // Unused |
82 | PHY_SET = 0x75, // JES20040127EEPROM | 82 | PHY_SET = 0x75, |
83 | PHY_CTRL = 0x76, | 83 | PHY_CTRL = 0x76, |
84 | STATION_ADDRESS_0 = 0x78, | 84 | STATION_ADDRESS_0 = 0x78, |
85 | STATION_ADDRESS_1 = 0x7a, | 85 | STATION_ADDRESS_1 = 0x7a, |
@@ -312,7 +312,7 @@ enum ipg_regs { | |||
312 | #define IPG_RM_RECEIVEMULTICASTHASH 0x10 | 312 | #define IPG_RM_RECEIVEMULTICASTHASH 0x10 |
313 | #define IPG_RM_RECEIVEIPMULTICAST 0x20 | 313 | #define IPG_RM_RECEIVEIPMULTICAST 0x20 |
314 | 314 | ||
315 | /* PhySet JES20040127EEPROM*/ | 315 | /* PhySet */ |
316 | #define IPG_PS_MEM_LENB9B 0x01 | 316 | #define IPG_PS_MEM_LENB9B 0x01 |
317 | #define IPG_PS_MEM_LEN9 0x02 | 317 | #define IPG_PS_MEM_LEN9 0x02 |
318 | #define IPG_PS_NON_COMPDET 0x04 | 318 | #define IPG_PS_NON_COMPDET 0x04 |
@@ -369,8 +369,8 @@ enum ipg_regs { | |||
369 | #define IPG_AC_RST_OUT 0x01000000 | 369 | #define IPG_AC_RST_OUT 0x01000000 |
370 | #define IPG_AC_INT_REQUEST 0x02000000 | 370 | #define IPG_AC_INT_REQUEST 0x02000000 |
371 | #define IPG_AC_RESET_BUSY 0x04000000 | 371 | #define IPG_AC_RESET_BUSY 0x04000000 |
372 | #define IPG_AC_LED_SPEED 0x08000000 //JES20040127EEPROM | 372 | #define IPG_AC_LED_SPEED 0x08000000 |
373 | #define IPG_AC_LED_MODE_BIT_1 0x20000000 //JES20040127EEPROM | 373 | #define IPG_AC_LED_MODE_BIT_1 0x20000000 |
374 | 374 | ||
375 | /* EepromCtrl */ | 375 | /* EepromCtrl */ |
376 | #define IPG_EC_RSVD_MASK 0x83FF | 376 | #define IPG_EC_RSVD_MASK 0x83FF |
@@ -785,7 +785,6 @@ struct ipg_nic_private { | |||
785 | unsigned int tx_dirty; | 785 | unsigned int tx_dirty; |
786 | unsigned int rx_current; | 786 | unsigned int rx_current; |
787 | unsigned int rx_dirty; | 787 | unsigned int rx_dirty; |
788 | // Add by Grace 2005/05/19 | ||
789 | #ifdef JUMBO_FRAME | 788 | #ifdef JUMBO_FRAME |
790 | struct SJumbo Jumbo; | 789 | struct SJumbo Jumbo; |
791 | #endif | 790 | #endif |
@@ -796,7 +795,6 @@ struct ipg_nic_private { | |||
796 | spinlock_t lock; | 795 | spinlock_t lock; |
797 | int tenmbpsmode; | 796 | int tenmbpsmode; |
798 | 797 | ||
799 | /*Jesse20040128EEPROM_VALUE */ | ||
800 | u16 LED_Mode; | 798 | u16 LED_Mode; |
801 | u16 station_addr[3]; /* Station Address in EEPROM Reg 0x10..0x12 */ | 799 | u16 station_addr[3]; /* Station Address in EEPROM Reg 0x10..0x12 */ |
802 | 800 | ||