net: phy: add support for reset-controller

This commit adds support for PHY reset pins handled by a reset controller.

Signed-off-by: David Bauer <mail@david-bauer.net>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 4be4cc09eb90b0c0f03e6fc5f1e3eb116671c0d9..ba3d2523808baef3cf4595b1be142c512acfe1de 100644 (file)
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -24,6 +24,7 @@
 #include <linux/of_gpio.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/reset.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
@@ -57,8 +58,23 @@ static int mdiobus_register_gpiod(struct mdio_device *mdiodev)
 
        mdiodev->reset = gpiod;
 
-       /* Assert the reset signal again */
-       mdio_device_reset(mdiodev, 1);
+       return 0;
+}
+
+static int mdiobus_register_reset(struct mdio_device *mdiodev)
+{
+       struct reset_control *reset = NULL;
+
+       if (mdiodev->dev.of_node)
+               reset = devm_reset_control_get_exclusive(&mdiodev->dev,
+                                                        "phy");
+       if (PTR_ERR(reset) == -ENOENT ||
+           PTR_ERR(reset) == -ENOTSUPP)
+               reset = NULL;
+       else if (IS_ERR(reset))
+               return PTR_ERR(reset);
+
+       mdiodev->reset_ctrl = reset;
 
        return 0;
 }
@@ -74,6 +90,13 @@ int mdiobus_register_device(struct mdio_device *mdiodev)
                err = mdiobus_register_gpiod(mdiodev);
                if (err)
                        return err;
+
+               err = mdiobus_register_reset(mdiodev);
+               if (err)
+                       return err;
+
+               /* Assert the reset signal */
+               mdio_device_reset(mdiodev, 1);
        }
 
        mdiodev->bus->mdio_map[mdiodev->addr] = mdiodev;

diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c
index 887076292e50fa9f5338b4658eb995760b739c5b..57668e0f9256797591bf13c7200fb9ae360fe342 100644 (file)
--- a/drivers/net/phy/mdio_device.c
+++ b/drivers/net/phy/mdio_device.c
@@ -16,6 +16,7 @@
 #include <linux/mii.h>
 #include <linux/module.h>
 #include <linux/phy.h>
+#include <linux/reset.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/unistd.h>
@@ -116,10 +117,18 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value)
 {
        unsigned int d;
 
-       if (!mdiodev->reset)
+       if (!mdiodev->reset && !mdiodev->reset_ctrl)
                return;
 
-       gpiod_set_value(mdiodev->reset, value);
+       if (mdiodev->reset)
+               gpiod_set_value(mdiodev->reset, value);
+
+       if (mdiodev->reset_ctrl) {
+               if (value)
+                       reset_control_assert(mdiodev->reset_ctrl);
+               else
+                       reset_control_deassert(mdiodev->reset_ctrl);
+       }
 
        d = value ? mdiodev->reset_assert_delay : mdiodev->reset_deassert_delay;
        if (d)

diff --git a/include/linux/mdio.h b/include/linux/mdio.h
index 3e99ae3ed87f67260aaca4654312ed1ca9f8809d..6eaf71500ef6e0181242422c2adab7b326ba4859 100644 (file)
--- a/include/linux/mdio.h
+++ b/include/linux/mdio.h
@@ -40,6 +40,7 @@ struct mdio_device {
        int addr;
        int flags;
        struct gpio_desc *reset;
+       struct reset_control *reset_ctrl;
        unsigned int reset_assert_delay;
        unsigned int reset_deassert_delay;
 };