diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-02-04 19:02:13 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-02-11 11:06:30 -0500 |
commit | 3927f1c88efc25b2972c8cbd7ed10d5f1b88b52a (patch) | |
tree | 66e010a03998ae80e67d9cab1a66b25b2f01db99 /drivers/net | |
parent | e662ee02cc9f1a61f309eaa44ce3c33dc6ed7b8a (diff) |
DM9000: Remove EEPROM initialisation code.
Remove the old hack to program an initial EEPROM setting
into the DM9000 as we now have ethtool support for reading
and writing the EEPROM.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/dm9000.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 2acab02a6428..3bef3b25ff0e 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
@@ -191,10 +191,6 @@ static void dm9000_write_eeprom(board_info_t *, int addr, u8 *dp); | |||
191 | static void dm9000_rx(struct net_device *); | 191 | static void dm9000_rx(struct net_device *); |
192 | static void dm9000_hash_table(struct net_device *); | 192 | static void dm9000_hash_table(struct net_device *); |
193 | 193 | ||
194 | //#define DM9000_PROGRAM_EEPROM | ||
195 | #ifdef DM9000_PROGRAM_EEPROM | ||
196 | static void program_eeprom(board_info_t * db); | ||
197 | #endif | ||
198 | /* DM9000 network board routine ---------------------------- */ | 194 | /* DM9000 network board routine ---------------------------- */ |
199 | 195 | ||
200 | static void | 196 | static void |
@@ -699,9 +695,6 @@ dm9000_probe(struct platform_device *pdev) | |||
699 | ndev->poll_controller = &dm9000_poll_controller; | 695 | ndev->poll_controller = &dm9000_poll_controller; |
700 | #endif | 696 | #endif |
701 | 697 | ||
702 | #ifdef DM9000_PROGRAM_EEPROM | ||
703 | program_eeprom(db); | ||
704 | #endif | ||
705 | db->msg_enable = NETIF_MSG_LINK; | 698 | db->msg_enable = NETIF_MSG_LINK; |
706 | db->mii.phy_id_mask = 0x1f; | 699 | db->mii.phy_id_mask = 0x1f; |
707 | db->mii.reg_num_mask = 0x1f; | 700 | db->mii.reg_num_mask = 0x1f; |
@@ -1112,28 +1105,6 @@ dm9000_write_eeprom(board_info_t *db, int offset, u8 *data) | |||
1112 | mutex_unlock(&db->addr_lock); | 1105 | mutex_unlock(&db->addr_lock); |
1113 | } | 1106 | } |
1114 | 1107 | ||
1115 | #ifdef DM9000_PROGRAM_EEPROM | ||
1116 | /* | ||
1117 | * Only for development: | ||
1118 | * Here we write static data to the eeprom in case | ||
1119 | * we don't have valid content on a new board | ||
1120 | */ | ||
1121 | static void | ||
1122 | program_eeprom(board_info_t * db) | ||
1123 | { | ||
1124 | u16 eeprom[] = { 0x0c00, 0x007f, 0x1300, /* MAC Address */ | ||
1125 | 0x0000, /* Autoload: accept nothing */ | ||
1126 | 0x0a46, 0x9000, /* Vendor / Product ID */ | ||
1127 | 0x0000, /* pin control */ | ||
1128 | 0x0000, | ||
1129 | }; /* Wake-up mode control */ | ||
1130 | int i; | ||
1131 | for (i = 0; i < 8; i++) | ||
1132 | write_srom_word(db, i, eeprom[i]); | ||
1133 | } | ||
1134 | #endif | ||
1135 | |||
1136 | |||
1137 | /* | 1108 | /* |
1138 | * Calculate the CRC valude of the Rx packet | 1109 | * Calculate the CRC valude of the Rx packet |
1139 | * flag = 1 : return the reverse CRC (for the received packet CRC) | 1110 | * flag = 1 : return the reverse CRC (for the received packet CRC) |