public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: mdio: rename mdio_device reset to reset_gpio

Browse source 
This renames the GPIO reset of mdio devices from 'reset' to
'reset_gpio' to better differentiate between GPIO and
reset-controller driven reset line.

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>
This commit is contained in:
David Bauer 2019-04-17 23:59:22 +02:00 • committed by David S. Miller
parent 71dd6c0dff
commit 6110ed2db3
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/phy/at803x.c
View file

@ -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 * in the FIFO. In such cases, the FIFO enters an error mode it
* cannot recover from by software. * 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; struct at803x_context context;
at803x_context_save(phydev, &context); at803x_context_save(phydev, &context);

6
drivers/net/phy/mdio_bus.c
View file

@ -56,7 +56,7 @@ static int mdiobus_register_gpiod(struct mdio_device *mdiodev)
return PTR_ERR(gpiod); return PTR_ERR(gpiod);
} }
mdiodev->reset = gpiod; mdiodev->reset_gpio = gpiod;
return 0; return 0;
} }
@ -469,8 +469,8 @@ void mdiobus_unregister(struct mii_bus *bus)
if (!mdiodev) if (!mdiodev)
continue; continue;
if (mdiodev->reset) if (mdiodev->reset_gpio)
gpiod_put(mdiodev->reset); gpiod_put(mdiodev->reset_gpio);
mdiodev->device_remove(mdiodev); mdiodev->device_remove(mdiodev);
mdiodev->device_free(mdiodev); mdiodev->device_free(mdiodev);

6
drivers/net/phy/mdio_device.c
View file

@ -117,11 +117,11 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value)
{ {
unsigned int d; unsigned int d;
if (!mdiodev->reset && !mdiodev->reset_ctrl) if (!mdiodev->reset_gpio && !mdiodev->reset_ctrl)
return; return;
if (mdiodev->reset) if (mdiodev->reset_gpio)
gpiod_set_value(mdiodev->reset, value); gpiod_set_value(mdiodev->reset_gpio, value);
if (mdiodev->reset_ctrl) { if (mdiodev->reset_ctrl) {
if (value) if (value)

2
include/linux/mdio.h
View file

@ -39,7 +39,7 @@ struct mdio_device {
/* Bus address of the MDIO device (0-31) */ /* Bus address of the MDIO device (0-31) */
int addr; int addr;
int flags; int flags;
struct gpio_desc *reset; struct gpio_desc *reset_gpio;
struct reset_control *reset_ctrl; struct reset_control *reset_ctrl;
unsigned int reset_assert_delay; unsigned int reset_assert_delay;
unsigned int reset_deassert_delay; unsigned int reset_deassert_delay;