The common code is now capable of handling reset GPIO associated with PHY. Drop the local ad-hoc code in favor of common code.
Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Geert Uytterhoeven geert+renesas@glider.be Cc: Joe Hershberger joe.hershberger@ni.com Cc: Michal Simek michal.simek@amd.com Cc: Nishanth Menon nm@ti.com Cc: Ramon Fried rfried.dev@gmail.com --- drivers/net/Kconfig | 1 + drivers/net/sh_eth.c | 17 ----------------- 2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 48f9efcc94f..7d482cb7745 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -695,6 +695,7 @@ config SUN8I_EMAC config SH_ETHER bool "Renesas SH Ethernet MAC" select PHYLIB + select PHY_ETHERNET_ID help This driver supports the Ethernet for Renesas SH and ARM SoCs.
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 14f7fd1bcc0..95042daade0 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -530,7 +530,6 @@ struct sh_ether_priv { struct mii_dev *bus; phys_addr_t iobase; struct clk clk; - struct gpio_desc reset_gpio; };
static int sh_ether_send(struct udevice *dev, void *packet, int len) @@ -650,7 +649,6 @@ static int sh_ether_probe(struct udevice *udev) struct eth_pdata *pdata = dev_get_plat(udev); struct sh_ether_priv *priv = dev_get_priv(udev); struct sh_eth_dev *eth = &priv->shdev; - struct ofnode_phandle_args phandle_args; struct mii_dev *mdiodev; int ret;
@@ -661,18 +659,6 @@ static int sh_ether_probe(struct udevice *udev) if (ret < 0) return ret; #endif - - ret = dev_read_phandle_with_args(udev, "phy-handle", NULL, 0, 0, &phandle_args); - if (!ret) { - gpio_request_by_name_nodev(phandle_args.node, "reset-gpios", 0, - &priv->reset_gpio, GPIOD_IS_OUT); - } - - if (!dm_gpio_is_valid(&priv->reset_gpio)) { - gpio_request_by_name(udev, "reset-gpios", 0, &priv->reset_gpio, - GPIOD_IS_OUT); - } - mdiodev = mdio_alloc(); if (!mdiodev) { ret = -ENOMEM; @@ -735,9 +721,6 @@ static int sh_ether_remove(struct udevice *udev) mdio_unregister(priv->bus); mdio_free(priv->bus);
- if (dm_gpio_is_valid(&priv->reset_gpio)) - dm_gpio_free(udev, &priv->reset_gpio); - return 0; }