diff options
| author | Ken Kawasaki <ken_kawasaki@spring.nifty.jp> | 2009-04-04 14:49:07 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-06 17:07:54 -0700 |
| commit | ad3620a072bc1ba93b0146f6f5467ae928b449a6 (patch) | |
| tree | 4fcde271fe0a8c55d31ca2eacff822bfd88c3e7c /drivers/net | |
| parent | 57579f7629a3d46c307405fbd2ea6bdb650d692f (diff) | |
| download | linux-3.10-ad3620a072bc1ba93b0146f6f5467ae928b449a6.tar.gz linux-3.10-ad3620a072bc1ba93b0146f6f5467ae928b449a6.tar.bz2 linux-3.10-ad3620a072bc1ba93b0146f6f5467ae928b449a6.zip | |
axnet_cs: fix phy_id detection for bogus Asix chip.
axnet_cs:
(1) Some Asix phy return bogus value except 0 or 0xffff.
Skip this phy_id.
(2) Some Asix chip need to set "select Internal PHY" bit
at AX88190_init.
Signed-off-by: Ken Kawasaki <ken_kawasaki@spring.nifty.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 501a8d7ac2b..15b8fe61695 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -339,7 +339,7 @@ static int axnet_config(struct pcmcia_device *link) { struct net_device *dev = link->priv; axnet_dev_t *info = PRIV(dev); - int i, j, last_ret, last_fn; + int i, j, j2, last_ret, last_fn; DEBUG(0, "axnet_config(0x%p)\n", link); @@ -388,6 +388,8 @@ static int axnet_config(struct pcmcia_device *link) for (i = 0; i < 32; i++) { j = mdio_read(dev->base_addr + AXNET_MII_EEP, i, 1); + j2 = mdio_read(dev->base_addr + AXNET_MII_EEP, i, 2); + if (j == j2) continue; if ((j != 0) && (j != 0xffff)) break; } @@ -398,6 +400,8 @@ static int axnet_config(struct pcmcia_device *link) pcmcia_access_configuration_register(link, ®); for (i = 0; i < 32; i++) { j = mdio_read(dev->base_addr + AXNET_MII_EEP, i, 1); + j2 = mdio_read(dev->base_addr + AXNET_MII_EEP, i, 2); + if (j == j2) continue; if ((j != 0) && (j != 0xffff)) break; } } @@ -1767,6 +1771,9 @@ static void AX88190_init(struct net_device *dev, int startp) ei_local->tx1 = ei_local->tx2 = 0; ei_local->txing = 0; + if (info->flags & IS_AX88790) /* select Internal PHY */ + outb(0x10, e8390_base + AXNET_GPIO); + if (startp) { outb_p(0xff, e8390_base + EN0_ISR); |