diff options
author | David S. Miller <davem@davemloft.net> | 2019-04-18 17:43:11 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-04-18 17:43:11 -0700 |
commit | 5c2e6e14a0ad24a35d9d2b318204c8c012d9d618 (patch) | |
tree | 504923c7b9b315877d980f8a63210674ecef21f7 /drivers/net/phy/mdio_device.c | |
parent | Merge branch 'net-some-build-fixes-and-other-improvements' (diff) | |
parent | net: mdio: rename mdio_device reset to reset_gpio (diff) | |
download | linux-dev-5c2e6e14a0ad24a35d9d2b318204c8c012d9d618.tar.xz linux-dev-5c2e6e14a0ad24a35d9d2b318204c8c012d9d618.zip |
Merge branch 'net-add-reset-controller-driven-PHY-reset'
David Bauer says:
====================
net: add reset-controller driven PHY reset
This patchset adds support for a PHY reset driven by a reset-controller.
Currently, only GPIO driven resets are supported by the PHY subsystem.
It also renames the reset-gpio from 'reset' to 'reset_gpio' to
better differentiate between resets wired to a GPIO and resets wired to
a reset-controller driven pin.
Some systems have the PHY reset-line wired to a pin controlled by a
reset-controller (eg. some Atheros AR9132 based boards). In case the
bootloader asserts reset before loading the kernel, we currently do not
have a clean way of deasserting reset to probe the PHY.
v3:
- add missing newline in mdio_bus.c
v2:
- fixed missed rename of "reset" in at803x.c
- move initial reset to mdio_device_reset
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/mdio_device.c')
-rw-r--r-- | drivers/net/phy/mdio_device.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c index 887076292e50..e282600bd83e 100644 --- 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_gpio && !mdiodev->reset_ctrl) return; - gpiod_set_value(mdiodev->reset, value); + if (mdiodev->reset_gpio) + gpiod_set_value(mdiodev->reset_gpio, 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) |