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/at803x.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/at803x.c')
-rw-r--r-- | drivers/net/phy/at803x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index 406111753f7c..222ccd9ecfce 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -331,7 +331,7 @@ static void at803x_link_change_notify(struct phy_device *phydev) * in the FIFO. In such cases, the FIFO enters an error mode it * cannot recover from by software. */ - if (phydev->state == PHY_NOLINK && phydev->mdio.reset) { + if (phydev->state == PHY_NOLINK && phydev->mdio.reset_gpio) { struct at803x_context context; at803x_context_save(phydev, &context); |