X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/7188638a39a72f181e017cb6b33afe758d389068..0b9f62a797253b25939b69b5820a1cc7d89d0220:/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c index cedbfe616..4233152ae 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c @@ -1,7 +1,7 @@ /* * Atheros AR71xx built-in ethernet mac driver * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2009 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * Based on Atheros' AG7100 driver @@ -27,22 +27,11 @@ static unsigned char *ag71xx_speed_str(struct ag71xx *ag) return "?"; } -#if 1 -#define PLL_VAL_1000 0x00110000 -#define PLL_VAL_100 0x00001099 -#define PLL_VAL_10 0x00991099 -#else -#define PLL_VAL_1000 0x01111000 -#define PLL_VAL_100 0x09991000 -#define PLL_VAL_10 0x09991999 -#endif - static void ag71xx_phy_link_update(struct ag71xx *ag) { struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); u32 cfg2; u32 ifctl; - u32 pll; u32 fifo5; u32 mii_speed; @@ -67,27 +56,32 @@ static void ag71xx_phy_link_update(struct ag71xx *ag) case SPEED_1000: mii_speed = MII_CTRL_SPEED_1000; cfg2 |= MAC_CFG2_IF_1000; - pll = PLL_VAL_1000; fifo5 |= FIFO_CFG5_BM; break; case SPEED_100: mii_speed = MII_CTRL_SPEED_100; cfg2 |= MAC_CFG2_IF_10_100; ifctl |= MAC_IFCTL_SPEED; - pll = PLL_VAL_100; break; case SPEED_10: mii_speed = MII_CTRL_SPEED_10; cfg2 |= MAC_CFG2_IF_10_100; - pll = PLL_VAL_10; break; default: BUG(); return; } - ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, 0x008001ff); - pdata->set_pll(pll); + if (pdata->is_ar91xx) + ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, 0x00780fff); + else if (pdata->is_ar724x) + ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, pdata->fifo_cfg3); + else + ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, 0x008001ff); + + if (pdata->set_pll) + pdata->set_pll(ag->speed); + ag71xx_mii_ctrl_set_speed(ag, mii_speed); ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2); @@ -136,12 +130,8 @@ static void ag71xx_phy_link_adjust(struct net_device *dev) } } - if (phydev->link != ag->link) { - if (phydev->link) - netif_schedule(dev); - + if (phydev->link != ag->link) status_change = 1; - } ag->link = phydev->link; ag->duplex = phydev->duplex; @@ -179,43 +169,68 @@ void ag71xx_phy_stop(struct ag71xx *ag) } } -int ag71xx_phy_connect(struct ag71xx *ag) +static int ag71xx_phy_connect_fixed(struct ag71xx *ag) +{ + struct net_device *dev = ag->dev; + struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); + int ret = 0; + + /* use fixed settings */ + switch (pdata->speed) { + case SPEED_10: + case SPEED_100: + case SPEED_1000: + break; + default: + printk(KERN_ERR "%s: invalid speed specified\n", + dev->name); + ret = -EINVAL; + break; + } + + return ret; +} + +static int ag71xx_phy_connect_multi(struct ag71xx *ag) { struct net_device *dev = ag->dev; struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); struct phy_device *phydev = NULL; int phy_count = 0; int phy_addr; + int ret = 0; - if (ag->mii_bus && pdata->phy_mask) { - /* TODO: use mutex of the mdio bus? */ - for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) { - if (!(pdata->phy_mask & (1 << phy_addr))) - continue; + for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) { + if (!(pdata->phy_mask & (1 << phy_addr))) + continue; - if (ag->mii_bus->phy_map[phy_addr] == NULL) - continue; + if (ag->mii_bus->phy_map[phy_addr] == NULL) + continue; - DBG("%s: PHY found at %s, uid=%08x\n", - dev->name, - ag->mii_bus->phy_map[phy_addr]->dev.bus_id, - ag->mii_bus->phy_map[phy_addr]->phy_id); + DBG("%s: PHY found at %s, uid=%08x\n", + dev->name, + dev_name(&ag->mii_bus->phy_map[phy_addr]->dev), + ag->mii_bus->phy_map[phy_addr]->phy_id); - if (phydev == NULL) - phydev = ag->mii_bus->phy_map[phy_addr]; + if (phydev == NULL) + phydev = ag->mii_bus->phy_map[phy_addr]; - phy_count++; - } + phy_count++; } switch (phy_count) { + case 0: + printk(KERN_ERR "%s: no PHY found with phy_mask=%08x\n", + dev->name, pdata->phy_mask); + ret = -ENODEV; + break; case 1: - ag->phy_dev = phy_connect(dev, phydev->dev.bus_id, + ag->phy_dev = phy_connect(dev, dev_name(&phydev->dev), &ag71xx_phy_link_adjust, 0, pdata->phy_if_mode); if (IS_ERR(ag->phy_dev)) { printk(KERN_ERR "%s: could not connect to PHY at %s\n", - dev->name, phydev->dev.bus_id); + dev->name, dev_name(&phydev->dev)); return PTR_ERR(ag->phy_dev); } @@ -229,7 +244,7 @@ int ag71xx_phy_connect(struct ag71xx *ag) printk(KERN_DEBUG "%s: connected to PHY at %s " "[uid=%08x, driver=%s]\n", - dev->name, phydev->dev.bus_id, + dev->name, dev_name(&phydev->dev), phydev->phy_id, phydev->drv->name); ag->link = 0; @@ -238,26 +253,74 @@ int ag71xx_phy_connect(struct ag71xx *ag) break; default: - switch (pdata->speed) { - case SPEED_10: - case SPEED_100: - case SPEED_1000: - break; - default: - printk(KERN_ERR "%s: invalid speed specified\n", - dev->name); - return -EINVAL; - } - - ag->phy_dev = NULL; printk(KERN_DEBUG "%s: connected to %d PHYs\n", dev->name, phy_count); + ret = ag71xx_phy_connect_fixed(ag); break; } + return ret; +} + +static int dev_is_class(struct device *dev, void *class) +{ + if (dev->class != NULL && !strcmp(dev->class->name, class)) + return 1; + return 0; } +static struct device *dev_find_class(struct device *parent, char *class) +{ + if (dev_is_class(parent, class)) { + get_device(parent); + return parent; + } + + return device_find_child(parent, class, dev_is_class); +} + +static struct mii_bus *dev_to_mii_bus(struct device *dev) +{ + struct device *d; + + d = dev_find_class(dev, "mdio_bus"); + if (d != NULL) { + struct mii_bus *bus; + + bus = to_mii_bus(d); + put_device(d); + + return bus; + } + + return NULL; +} + +int ag71xx_phy_connect(struct ag71xx *ag) +{ + struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); + + ag->mii_bus = dev_to_mii_bus(pdata->mii_bus_dev); + if (ag->mii_bus == NULL) { + printk(KERN_ERR "%s: unable to find MII bus on device '%s'\n", + ag->dev->name, dev_name(pdata->mii_bus_dev)); + return -ENODEV; + } + + /* Reset the mdio bus explicitly */ + if (ag->mii_bus->reset) { + mutex_lock(&ag->mii_bus->mdio_lock); + ag->mii_bus->reset(ag->mii_bus); + mutex_unlock(&ag->mii_bus->mdio_lock); + } + + if (pdata->phy_mask) + return ag71xx_phy_connect_multi(ag); + + return ag71xx_phy_connect_fixed(ag); +} + void ag71xx_phy_disconnect(struct ag71xx *ag) { if (ag->phy_dev)