ar71xx: ag71xx: move link update function

[openwrt.git] / 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 004d886..4425b74 100644 (file)
--- 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-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Based on Atheros' AG7100 driver
@@ -13,100 +13,6 @@
 
 #include "ag71xx.h"
 
-static unsigned char *ag71xx_speed_str(struct ag71xx *ag)
-{
-       switch (ag->speed) {
-       case SPEED_1000:
-               return "1000";
-       case SPEED_100:
-               return "100";
-       case SPEED_10:
-               return "10";
-       }
-
-       return "?";
-}
-
-static void ag71xx_phy_link_update(struct ag71xx *ag)
-{
-       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
-       u32 cfg2;
-       u32 ifctl;
-       u32 fifo5;
-       u32 mii_speed;
-
-       if (!ag->link) {
-               netif_carrier_off(ag->dev);
-               if (netif_msg_link(ag))
-                       printk(KERN_INFO "%s: link down\n", ag->dev->name);
-               return;
-       }
-
-       cfg2 = ag71xx_rr(ag, AG71XX_REG_MAC_CFG2);
-       cfg2 &= ~(MAC_CFG2_IF_1000 | MAC_CFG2_IF_10_100 | MAC_CFG2_FDX);
-       cfg2 |= (ag->duplex) ? MAC_CFG2_FDX : 0;
-
-       ifctl = ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL);
-       ifctl &= ~(MAC_IFCTL_SPEED);
-
-       fifo5 = ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5);
-       fifo5 &= ~FIFO_CFG5_BM;
-
-       switch (ag->speed) {
-       case SPEED_1000:
-               mii_speed =  MII_CTRL_SPEED_1000;
-               cfg2 |= MAC_CFG2_IF_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;
-               break;
-       case SPEED_10:
-               mii_speed = MII_CTRL_SPEED_10;
-               cfg2 |= MAC_CFG2_IF_10_100;
-               break;
-       default:
-               BUG();
-               return;
-       }
-
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3,
-                       pdata->is_ar91xx ? 0x780fff : 0x008001ff);
-       pdata->set_pll(ag->speed);
-       ag71xx_mii_ctrl_set_speed(ag, mii_speed);
-
-       ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, fifo5);
-       ag71xx_wr(ag, AG71XX_REG_MAC_IFCTL, ifctl);
-
-       netif_carrier_on(ag->dev);
-       if (netif_msg_link(ag))
-               printk(KERN_INFO "%s: link up (%sMbps/%s duplex)\n",
-                       ag->dev->name,
-                       ag71xx_speed_str(ag),
-                       (DUPLEX_FULL == ag->duplex) ? "Full" : "Half");
-
-       DBG("%s: fifo_cfg0=%#x, fifo_cfg1=%#x, fifo_cfg2=%#x\n",
-               ag->dev->name,
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG0),
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG1),
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG2));
-
-       DBG("%s: fifo_cfg3=%#x, fifo_cfg4=%#x, fifo_cfg5=%#x\n",
-               ag->dev->name,
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG3),
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG4),
-               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5));
-
-       DBG("%s: mac_cfg2=%#x, mac_ifctl=%#x, mii_ctrl=%#x\n",
-               ag->dev->name,
-               ag71xx_rr(ag, AG71XX_REG_MAC_CFG2),
-               ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL),
-               ag71xx_mii_ctrl_rr(ag));
-}
-
 static void ag71xx_phy_link_adjust(struct net_device *dev)
 {
        struct ag71xx *ag = netdev_priv(dev);
@@ -131,7 +37,7 @@ static void ag71xx_phy_link_adjust(struct net_device *dev)
        ag->speed = phydev->speed;
 
        if (status_change)
-               ag71xx_phy_link_update(ag);
+               ag71xx_link_adjust(ag);
 
        spin_unlock_irqrestore(&ag->lock, flags);
 }
@@ -146,7 +52,7 @@ void ag71xx_phy_start(struct ag71xx *ag)
                ag->duplex = pdata->duplex;
                ag->speed = pdata->speed;
                ag->link = 1;
-               ag71xx_phy_link_update(ag);
+               ag71xx_link_adjust(ag);
        }
 }
 
@@ -158,7 +64,7 @@ void ag71xx_phy_stop(struct ag71xx *ag)
                ag->duplex = -1;
                ag->link = 0;
                ag->speed = 0;
-               ag71xx_phy_link_update(ag);
+               ag71xx_link_adjust(ag);
        }
 }
 
@@ -255,10 +161,59 @@ static int ag71xx_phy_connect_multi(struct ag71xx *ag)
        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);