aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2016-05-18 12:05:00 -0400
committerDavid S. Miller <davem@davemloft.net>2016-05-20 17:56:59 -0400
commit948350140ef060a42621de0de5c396807f7ec1fc (patch)
treeed96d77c82452cf27622c2833caf0dc8c1b2cef3 /drivers/net/phy
parentc0fcded2e6879d817cec822b8513a2f6b6e4dfe9 (diff)
Revert "phy: add support for a reset-gpio specification"
Commit da47b4572056 ("phy: add support for a reset-gpio specification") causes the following xtensa qemu crash according to Guenter Roeck: [ 9.366256] libphy: ethoc-mdio: probed [ 9.367389] (null): could not attach to PHY [ 9.368555] (null): failed to probe MDIO bus [ 9.371540] Unable to handle kernel paging request at virtual address 0000001c [ 9.371540] pc = d0320926, ra = 903209d1 [ 9.375358] Oops: sig: 11 [#1] This reverts commit da47b4572056487fd7941c26f73b3e8815ff712a. Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Tested-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/phy_device.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 307f72a0f2e2..e977ba931878 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -34,7 +34,6 @@
34#include <linux/io.h> 34#include <linux/io.h>
35#include <linux/uaccess.h> 35#include <linux/uaccess.h>
36#include <linux/of.h> 36#include <linux/of.h>
37#include <linux/gpio/consumer.h>
38 37
39#include <asm/irq.h> 38#include <asm/irq.h>
40 39
@@ -1571,16 +1570,9 @@ static int phy_probe(struct device *dev)
1571 struct device_driver *drv = phydev->mdio.dev.driver; 1570 struct device_driver *drv = phydev->mdio.dev.driver;
1572 struct phy_driver *phydrv = to_phy_driver(drv); 1571 struct phy_driver *phydrv = to_phy_driver(drv);
1573 int err = 0; 1572 int err = 0;
1574 struct gpio_descs *reset_gpios;
1575 1573
1576 phydev->drv = phydrv; 1574 phydev->drv = phydrv;
1577 1575
1578 /* take phy out of reset */
1579 reset_gpios = devm_gpiod_get_array_optional(dev, "reset",
1580 GPIOD_OUT_LOW);
1581 if (IS_ERR(reset_gpios))
1582 return PTR_ERR(reset_gpios);
1583
1584 /* Disable the interrupt if the PHY doesn't support it 1576 /* Disable the interrupt if the PHY doesn't support it
1585 * but the interrupt is still a valid one 1577 * but the interrupt is still a valid one
1586 */ 1578 */