]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
smsc75xx: enable mac to detect speed/duplex from phy
authorSteve Glendinning <steve.glendinning@shawell.net>
Mon, 30 Apr 2012 07:56:56 +0000 (07:56 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 May 2012 01:52:42 +0000 (21:52 -0400)
This patch sets the automatic speed and duplex detection bits
in MAC_CR to enable the mac to determine its speed automatically
from the phy.

Note this must be done BEFORE the receiver or transmitter is
enabled.

Signed-off-by: Stephane Fillod <fillods@users.sf.net>
Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/smsc75xx.c

index ae23d85a973aa142d320571d7f0c282bcfde0ac6..00103a8c5e04d69e17408d32f139c9bee93aa03c 100644 (file)
@@ -951,6 +951,14 @@ static int smsc75xx_reset(struct usbnet *dev)
        ret = smsc75xx_write_reg(dev, INT_EP_CTL, buf);
        check_warn_return(ret, "Failed to write INT_EP_CTL: %d", ret);
 
+       /* allow mac to detect speed and duplex from phy */
+       ret = smsc75xx_read_reg(dev, MAC_CR, &buf);
+       check_warn_return(ret, "Failed to read MAC_CR: %d", ret);
+
+       buf |= (MAC_CR_ADD | MAC_CR_ASD);
+       ret = smsc75xx_write_reg(dev, MAC_CR, buf);
+       check_warn_return(ret, "Failed to write MAC_CR: %d", ret);
+
        ret = smsc75xx_read_reg(dev, MAC_TX, &buf);
        check_warn_return(ret, "Failed to read MAC_TX: %d", ret);