]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net/macb: add support for phy irq via gpio pin
authorJoachim Eastwood <manabian@gmail.com>
Sun, 11 Nov 2012 13:56:27 +0000 (13:56 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 14 Nov 2012 23:51:02 +0000 (18:51 -0500)
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb.c

index 1fac769989adf128a0dc8efea2665cb026043398..ca34efc62baeed98b74dfbffc22a353d612491f1 100644 (file)
@@ -16,6 +16,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/init.h>
+#include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -261,7 +262,9 @@ static void macb_handle_link_change(struct net_device *dev)
 static int macb_mii_probe(struct net_device *dev)
 {
        struct macb *bp = netdev_priv(dev);
+       struct macb_platform_data *pdata;
        struct phy_device *phydev;
+       int phy_irq;
        int ret;
 
        phydev = phy_find_first(bp->mii_bus);
@@ -270,7 +273,14 @@ static int macb_mii_probe(struct net_device *dev)
                return -1;
        }
 
-       /* TODO : add pin_irq */
+       pdata = dev_get_platdata(&bp->pdev->dev);
+       if (pdata && gpio_is_valid(pdata->phy_irq_pin)) {
+               ret = devm_gpio_request(&bp->pdev->dev, pdata->phy_irq_pin, "phy int");
+               if (!ret) {
+                       phy_irq = gpio_to_irq(pdata->phy_irq_pin);
+                       phydev->irq = (phy_irq < 0) ? PHY_POLL : phy_irq;
+               }
+       }
 
        /* attach the mac to the phy */
        ret = phy_connect_direct(dev, phydev, &macb_handle_link_change, 0,