| From d16386159ba6c2710b93c5116134a242cdec0bb5 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Mon, 4 Dec 2017 11:34:50 +0100 |
| Subject: [PATCH 0756/1795] macb: Kill PHY reset code |
| |
| With the phylib now being aware of the "reset-gpios" PHY node property, |
| there should be no need to frob the PHY reset in this driver anymore... |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> |
| Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 096457b5523bbbb371c0099d4db5663fa084494a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/net/ethernet/cadence/macb.h | 1 - |
| drivers/net/ethernet/cadence/macb_main.c | 21 --------------------- |
| 2 files changed, 22 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h |
| index c93f3a2dc6c1..146cb24ebf44 100644 |
| --- a/drivers/net/ethernet/cadence/macb.h |
| +++ b/drivers/net/ethernet/cadence/macb.h |
| @@ -1032,7 +1032,6 @@ struct macb { |
| unsigned int dma_burst_length; |
| |
| phy_interface_t phy_interface; |
| - struct gpio_desc *reset_gpio; |
| |
| /* AT91RM9200 transmit */ |
| struct sk_buff *skb; /* holds skb until xmit interrupt completes */ |
| diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c |
| index dfef4ec167c1..26da92fca367 100644 |
| --- a/drivers/net/ethernet/cadence/macb_main.c |
| +++ b/drivers/net/ethernet/cadence/macb_main.c |
| @@ -3396,7 +3396,6 @@ static int macb_probe(struct platform_device *pdev) |
| = macb_config->clk_init; |
| int (*init)(struct platform_device *) = macb_config->init; |
| struct device_node *np = pdev->dev.of_node; |
| - struct device_node *phy_node; |
| struct clk *pclk, *hclk = NULL, *tx_clk = NULL, *rx_clk = NULL; |
| unsigned int queue_mask, num_queues; |
| struct macb_platform_data *pdata; |
| @@ -3502,18 +3501,6 @@ static int macb_probe(struct platform_device *pdev) |
| else |
| macb_get_hwaddr(bp); |
| |
| - /* Power up the PHY if there is a GPIO reset */ |
| - phy_node = of_get_next_available_child(np, NULL); |
| - if (phy_node) { |
| - int gpio = of_get_named_gpio(phy_node, "reset-gpios", 0); |
| - |
| - if (gpio_is_valid(gpio)) { |
| - bp->reset_gpio = gpio_to_desc(gpio); |
| - gpiod_direction_output(bp->reset_gpio, 1); |
| - } |
| - } |
| - of_node_put(phy_node); |
| - |
| err = of_get_phy_mode(np); |
| if (err < 0) { |
| pdata = dev_get_platdata(&pdev->dev); |
| @@ -3557,10 +3544,6 @@ static int macb_probe(struct platform_device *pdev) |
| mdiobus_unregister(bp->mii_bus); |
| mdiobus_free(bp->mii_bus); |
| |
| - /* Shutdown the PHY if there is a GPIO reset */ |
| - if (bp->reset_gpio) |
| - gpiod_set_value(bp->reset_gpio, 0); |
| - |
| err_out_free_netdev: |
| free_netdev(dev); |
| |
| @@ -3588,10 +3571,6 @@ static int macb_remove(struct platform_device *pdev) |
| dev->phydev = NULL; |
| mdiobus_free(bp->mii_bus); |
| |
| - /* Shutdown the PHY if there is a GPIO reset */ |
| - if (bp->reset_gpio) |
| - gpiod_set_value(bp->reset_gpio, 0); |
| - |
| unregister_netdev(dev); |
| clk_disable_unprepare(bp->tx_clk); |
| clk_disable_unprepare(bp->hclk); |
| -- |
| 2.19.0 |
| |