1 From 71dd6c0dff51b5f1fef2e9dfa6f6a948aac975f3 Mon Sep 17 00:00:00 2001
2 From: David Bauer <mail@david-bauer.net>
3 Date: Wed, 17 Apr 2019 23:59:21 +0200
4 Subject: [PATCH] net: phy: add support for reset-controller
6 This commit adds support for PHY reset pins handled by a reset controller.
8 Signed-off-by: David Bauer <mail@david-bauer.net>
9 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
10 Signed-off-by: David S. Miller <davem@davemloft.net>
12 drivers/net/phy/mdio_bus.c | 27 +++++++++++++++++++++++++--
13 drivers/net/phy/mdio_device.c | 13 +++++++++++--
14 include/linux/mdio.h | 1 +
15 3 files changed, 37 insertions(+), 4 deletions(-)
17 --- a/drivers/net/phy/mdio_bus.c
18 +++ b/drivers/net/phy/mdio_bus.c
20 #include <linux/of_gpio.h>
21 #include <linux/netdevice.h>
22 #include <linux/etherdevice.h>
23 +#include <linux/reset.h>
24 #include <linux/skbuff.h>
25 #include <linux/spinlock.h>
27 @@ -65,8 +66,23 @@ static int mdiobus_register_gpiod(struct
29 mdiodev->reset = gpiod;
31 - /* Assert the reset signal again */
32 - mdio_device_reset(mdiodev, 1);
36 +static int mdiobus_register_reset(struct mdio_device *mdiodev)
38 + struct reset_control *reset = NULL;
40 + if (mdiodev->dev.of_node)
41 + reset = devm_reset_control_get_exclusive(&mdiodev->dev,
43 + if (PTR_ERR(reset) == -ENOENT ||
44 + PTR_ERR(reset) == -ENOTSUPP)
46 + else if (IS_ERR(reset))
47 + return PTR_ERR(reset);
49 + mdiodev->reset_ctrl = reset;
53 @@ -82,6 +98,13 @@ int mdiobus_register_device(struct mdio_
54 err = mdiobus_register_gpiod(mdiodev);
58 + err = mdiobus_register_reset(mdiodev);
62 + /* Assert the reset signal */
63 + mdio_device_reset(mdiodev, 1);
66 mdiodev->bus->mdio_map[mdiodev->addr] = mdiodev;
67 --- a/drivers/net/phy/mdio_device.c
68 +++ b/drivers/net/phy/mdio_device.c
70 #include <linux/mii.h>
71 #include <linux/module.h>
72 #include <linux/phy.h>
73 +#include <linux/reset.h>
74 #include <linux/slab.h>
75 #include <linux/string.h>
76 #include <linux/unistd.h>
77 @@ -121,10 +122,18 @@ void mdio_device_reset(struct mdio_devic
81 - if (!mdiodev->reset)
82 + if (!mdiodev->reset && !mdiodev->reset_ctrl)
85 - gpiod_set_value(mdiodev->reset, value);
87 + gpiod_set_value(mdiodev->reset, value);
89 + if (mdiodev->reset_ctrl) {
91 + reset_control_assert(mdiodev->reset_ctrl);
93 + reset_control_deassert(mdiodev->reset_ctrl);
96 d = value ? mdiodev->reset_assert_delay : mdiodev->reset_deassert_delay;
98 --- a/include/linux/mdio.h
99 +++ b/include/linux/mdio.h
100 @@ -40,6 +40,7 @@ struct mdio_device {
103 struct gpio_desc *reset;
104 + struct reset_control *reset_ctrl;
105 unsigned int reset_assert_delay;
106 unsigned int reset_deassert_delay;