aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smsc911x.c
diff options
context:
space:
mode:
authorSteve Glendinning <steve.glendinning@smsc.com>2009-03-26 03:14:36 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-27 03:46:38 -0400
commit58add9fc02e7a9dbab9d80d5fa64f13972e91eb5 (patch)
tree1bc6efee3a5764a9462eb6d3a9987b1add021bc4 /drivers/net/smsc911x.c
parent54dc79fe0d895758bdaa1dcf8512d3d21263d105 (diff)
smsc911x: enforce read-after-write timing restriction on eeprom access
The LAN911x datasheet specifies a minimum delay of 45ns between a write of E2P_DATA and any read. This patch adds a single dummy read of BYTE_TEST to enforce this timing constraint. Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/smsc911x.c')
-rw-r--r--drivers/net/smsc911x.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index ad3cbc91a8fa..af8f60ca0f57 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -1680,6 +1680,7 @@ static int smsc911x_eeprom_write_location(struct smsc911x_data *pdata,
1680 u8 address, u8 data) 1680 u8 address, u8 data)
1681{ 1681{
1682 u32 op = E2P_CMD_EPC_CMD_ERASE_ | address; 1682 u32 op = E2P_CMD_EPC_CMD_ERASE_ | address;
1683 u32 temp;
1683 int ret; 1684 int ret;
1684 1685
1685 SMSC_TRACE(DRV, "address 0x%x, data 0x%x", address, data); 1686 SMSC_TRACE(DRV, "address 0x%x, data 0x%x", address, data);
@@ -1688,6 +1689,10 @@ static int smsc911x_eeprom_write_location(struct smsc911x_data *pdata,
1688 if (!ret) { 1689 if (!ret) {
1689 op = E2P_CMD_EPC_CMD_WRITE_ | address; 1690 op = E2P_CMD_EPC_CMD_WRITE_ | address;
1690 smsc911x_reg_write(pdata, E2P_DATA, (u32)data); 1691 smsc911x_reg_write(pdata, E2P_DATA, (u32)data);
1692
1693 /* Workaround for hardware read-after-write restriction */
1694 temp = smsc911x_reg_read(pdata, BYTE_TEST);
1695
1691 ret = smsc911x_eeprom_send_cmd(pdata, op); 1696 ret = smsc911x_eeprom_send_cmd(pdata, op);
1692 } 1697 }
1693 1698