Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / drivers / net / ethernet / freescale / fec_main.c

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 45b8b22b9987fdb41d0ef7030a1cbe12f7c2e353..6530177d53e74e5630f637a19cdcd3a85327eef9 100644 (file)
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -1679,8 +1679,12 @@ static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
        if (!phydev)
                return -ENODEV;
 
-       if (cmd == SIOCSHWTSTAMP && fep->bufdesc_ex)
-               return fec_ptp_ioctl(ndev, rq, cmd);
+       if (fep->bufdesc_ex) {
+               if (cmd == SIOCSHWTSTAMP)
+                       return fec_ptp_set(ndev, rq);
+               if (cmd == SIOCGHWTSTAMP)
+                       return fec_ptp_get(ndev, rq);
+       }
 
        return phy_mii_ioctl(phydev, rq, cmd);
 }
@@ -2049,8 +2053,6 @@ static void fec_reset_phy(struct platform_device *pdev)
        int err, phy_reset;
        int msec = 1;
        struct device_node *np = pdev->dev.of_node;
-       enum of_gpio_flags flags;
-       bool port;
 
        if (!np)
                return;
@@ -2060,22 +2062,18 @@ static void fec_reset_phy(struct platform_device *pdev)
        if (msec > 1000)
                msec = 1;
 
-       phy_reset = of_get_named_gpio_flags(np, "phy-reset-gpios", 0, &flags);
+       phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
        if (!gpio_is_valid(phy_reset))
                return;
 
-       if (flags & OF_GPIO_ACTIVE_LOW)
-               port = GPIOF_OUT_INIT_LOW;
-       else
-               port = GPIOF_OUT_INIT_HIGH;
-
-       err = devm_gpio_request_one(&pdev->dev, phy_reset, port, "phy-reset");
+       err = devm_gpio_request_one(&pdev->dev, phy_reset,
+                                   GPIOF_OUT_INIT_LOW, "phy-reset");
        if (err) {
                dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err);
                return;
        }
        msleep(msec);
-       gpio_set_value(phy_reset, !port);
+       gpio_set_value(phy_reset, 1);
 }
 #else /* CONFIG_OF */
 static void fec_reset_phy(struct platform_device *pdev)