ar71xx: merge ag71xx specific patches

[openwrt.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_main.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 9442047..ebcb907 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -402,8 +402,13 @@ static void ag71xx_hw_init(struct ag71xx *ag)
 
        /* setup FIFO configuration registers */
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT);
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, 0x0fff0000);
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, 0x00001fff);
+       if (pdata->is_ar724x) {
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, pdata->fifo_cfg1);
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, pdata->fifo_cfg2);
+       } else {
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, 0x0fff0000);
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, 0x00001fff);
+       }
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG4, FIFO_CFG4_INIT);
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, FIFO_CFG5_INIT);
 
@@ -430,12 +435,16 @@ static void ag71xx_hw_stop(struct ag71xx *ag)
 static int ag71xx_open(struct net_device *dev)
 {
        struct ag71xx *ag = netdev_priv(dev);
-       int ret;
+       int err;
 
-       ret = ag71xx_rings_init(ag);
-       if (ret)
+       err = ag71xx_phy_connect(ag);
+       if (err)
                goto err;
 
+       err = ag71xx_rings_init(ag);
+       if (err)
+               goto err_ring_cleanup;
+
        napi_enable(&ag->napi);
 
        netif_carrier_off(dev);
@@ -452,9 +461,10 @@ static int ag71xx_open(struct net_device *dev)
 
        return 0;
 
- err:
+ err_ring_cleanup:
        ag71xx_rings_cleanup(ag);
-       return ret;
+ err:
+       return err;
 }
 
 static int ag71xx_stop(struct net_device *dev)
@@ -477,6 +487,7 @@ static int ag71xx_stop(struct net_device *dev)
        spin_unlock_irqrestore(&ag->lock, flags);
 
        ag71xx_rings_cleanup(ag);
+       ag71xx_phy_disconnect(ag);
 
        return 0;
 }
@@ -582,7 +593,7 @@ static void ag71xx_oom_timer_handler(unsigned long data)
        struct net_device *dev = (struct net_device *) data;
        struct ag71xx *ag = netdev_priv(dev);
 
-       netif_rx_schedule(dev, &ag->napi);
+       napi_schedule(&ag->napi);
 }
 
 static void ag71xx_tx_timeout(struct net_device *dev)
@@ -738,7 +749,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                DBG("%s: disable polling mode, done=%d, limit=%d\n",
                        dev->name, done, limit);
 
-               netif_rx_complete(dev, napi);
+               napi_complete(napi);
 
                /* enable interrupts */
                spin_lock_irqsave(&ag->lock, flags);
@@ -757,7 +768,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                printk(KERN_DEBUG "%s: out of memory\n", dev->name);
 
        mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
-       netif_rx_complete(dev, napi);
+       napi_complete(napi);
        return 0;
 }
 
@@ -787,7 +798,7 @@ static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)
        if (likely(status & AG71XX_INT_POLL)) {
                ag71xx_int_disable(ag, AG71XX_INT_POLL);
                DBG("%s: enable polling mode\n", dev->name);
-               netif_rx_schedule(dev, &ag->napi);
+               napi_schedule(&ag->napi);
        }
 
        return IRQ_HANDLED;
@@ -798,6 +809,18 @@ static void ag71xx_set_multicast_list(struct net_device *dev)
        /* TODO */
 }
 
+static const struct net_device_ops ag71xx_netdev_ops = {
+       .ndo_open               = ag71xx_open,
+       .ndo_stop               = ag71xx_stop,
+       .ndo_start_xmit         = ag71xx_hard_start_xmit,
+       .ndo_set_multicast_list = ag71xx_set_multicast_list,
+       .ndo_do_ioctl           = ag71xx_do_ioctl,
+       .ndo_tx_timeout         = ag71xx_tx_timeout,
+       .ndo_change_mtu         = eth_change_mtu,
+       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_validate_addr      = eth_validate_addr,
+};
+
 static int __init ag71xx_probe(struct platform_device *pdev)
 {
        struct net_device *dev;
@@ -813,6 +836,12 @@ static int __init ag71xx_probe(struct platform_device *pdev)
                goto err_out;
        }
 
+       if (pdata->mii_bus_dev == NULL) {
+               dev_err(&pdev->dev, "no MII bus device specified\n");
+               err = -EINVAL;
+               goto err_out;
+       }
+
        dev = alloc_etherdev(sizeof(*ag));
        if (!dev) {
                dev_err(&pdev->dev, "alloc_etherdev failed\n");
@@ -825,7 +854,6 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        ag = netdev_priv(dev);
        ag->pdev = pdev;
        ag->dev = dev;
-       ag->mii_bus = ag71xx_mdio_bus->mii_bus;
        ag->msg_enable = netif_msg_init(ag71xx_msg_level,
                                        AG71XX_DEFAULT_MSG_ENABLE);
        spin_lock_init(&ag->lock);
@@ -868,14 +896,9 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        }
 
        dev->base_addr = (unsigned long)ag->mac_base;
-       dev->open = ag71xx_open;
-       dev->stop = ag71xx_stop;
-       dev->hard_start_xmit = ag71xx_hard_start_xmit;
-       dev->set_multicast_list = ag71xx_set_multicast_list;
-       dev->do_ioctl = ag71xx_do_ioctl;
+       dev->netdev_ops = &ag71xx_netdev_ops;
        dev->ethtool_ops = &ag71xx_ethtool_ops;
 
-       dev->tx_timeout = ag71xx_tx_timeout;
        INIT_WORK(&ag->restart_work, ag71xx_restart_work_func);
 
        init_timer(&ag->oom_timer);
@@ -901,23 +924,10 @@ static int __init ag71xx_probe(struct platform_device *pdev)
 
        ag71xx_dump_regs(ag);
 
-       /* Reset the mdio bus explicitly */
-       if (ag->mii_bus) {
-               mutex_lock(&ag->mii_bus->mdio_lock);
-               ag->mii_bus->reset(ag->mii_bus);
-               mutex_unlock(&ag->mii_bus->mdio_lock);
-       }
-
-       err = ag71xx_phy_connect(ag);
-       if (err)
-               goto err_unregister_netdev;
-
        platform_set_drvdata(pdev, dev);
 
        return 0;
 
- err_unregister_netdev:
-       unregister_netdev(dev);
  err_free_irq:
        free_irq(dev->irq, dev);
  err_unmap_mii_ctrl:
@@ -938,7 +948,6 @@ static int __exit ag71xx_remove(struct platform_device *pdev)
        if (dev) {
                struct ag71xx *ag = netdev_priv(dev);
 
-               ag71xx_phy_disconnect(ag);
                unregister_netdev(dev);
                free_irq(dev->irq, dev);
                iounmap(ag->mii_ctrl);