1 --- a/drivers/net/ethernet/atheros/ar231x/ar231x.c
2 +++ b/drivers/net/ethernet/atheros/ar231x/ar231x.c
3 @@ -135,6 +135,7 @@ static int ar231x_mdiobus_write(struct m
4 static int ar231x_mdiobus_reset(struct mii_bus *bus);
5 static int ar231x_mdiobus_probe(struct net_device *dev);
6 static void ar231x_adjust_link(struct net_device *dev);
10 #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
11 @@ -167,6 +168,32 @@ static const struct net_device_ops ar231
15 +static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id)
20 + * Grab the bits from PHYIR1, and put them
21 + * in the upper half.
23 + phy_reg = mdiobus_read(bus, addr, MII_PHYSID1);
28 + *phy_id = (phy_reg & 0xffff) << 16;
30 + /* Grab the bits from PHYIR2, and put them in the lower half */
31 + phy_reg = mdiobus_read(bus, addr, MII_PHYSID2);
36 + *phy_id |= (phy_reg & 0xffff);
41 static int ar231x_probe(struct platform_device *pdev)
43 struct net_device *dev;
44 @@ -273,6 +300,24 @@ static int ar231x_probe(struct platform_
46 mdiobus_register(sp->mii_bus);
49 + * Workaround for Micrel switch, which is only available on
50 + * one PHY and cannot be configured through MDIO.
55 + get_phy_id(sp->mii_bus, 1, &phy_id);
56 + if (phy_id == 0x00221450)
61 + netif_carrier_on(dev);
66 if (ar231x_mdiobus_probe(dev) != 0) {
67 printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
68 rx_tasklet_cleanup(dev);
69 @@ -326,8 +371,10 @@ static int ar231x_remove(struct platform
70 rx_tasklet_cleanup(dev);
71 ar231x_init_cleanup(dev);
72 unregister_netdev(dev);
73 - mdiobus_unregister(sp->mii_bus);
74 - mdiobus_free(sp->mii_bus);
76 + mdiobus_unregister(sp->mii_bus);
77 + mdiobus_free(sp->mii_bus);
82 @@ -870,7 +917,8 @@ static int ar231x_open(struct net_device
84 sp->eth_regs->mac_control |= MAC_CONTROL_RE;
86 - phy_start(sp->phy_dev);
88 + phy_start(sp->phy_dev);
92 @@ -951,7 +999,8 @@ static int ar231x_close(struct net_devic
96 - phy_stop(sp->phy_dev);
98 + phy_stop(sp->phy_dev);
102 @@ -995,6 +1044,9 @@ static int ar231x_ioctl(struct net_devic
104 struct ar231x_private *sp = netdev_priv(dev);