From 948350140ef060a42621de0de5c396807f7ec1fc Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 18 May 2016 13:05:00 -0300 Subject: 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 Signed-off-by: Fabio Estevam Acked-by: Florian Fainelli Tested-by: Guenter Roeck Signed-off-by: David S. Miller diff --git a/Documentation/devicetree/bindings/net/phy.txt b/Documentation/devicetree/bindings/net/phy.txt index c00a9a8..bc1c3c8 100644 --- a/Documentation/devicetree/bindings/net/phy.txt +++ b/Documentation/devicetree/bindings/net/phy.txt @@ -35,8 +35,6 @@ Optional Properties: - broken-turn-around: If set, indicates the PHY device does not correctly release the turn around line low at the end of a MDIO transaction. -- reset-gpios: Reference to a GPIO used to reset the phy. - Example: ethernet-phy@0 { @@ -44,5 +42,4 @@ ethernet-phy@0 { interrupt-parent = <40000>; interrupts = <35 1>; reg = <0>; - reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; }; diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 307f72a..e977ba9 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -34,7 +34,6 @@ #include #include #include -#include #include @@ -1571,16 +1570,9 @@ static int phy_probe(struct device *dev) struct device_driver *drv = phydev->mdio.dev.driver; struct phy_driver *phydrv = to_phy_driver(drv); int err = 0; - struct gpio_descs *reset_gpios; phydev->drv = phydrv; - /* take phy out of reset */ - reset_gpios = devm_gpiod_get_array_optional(dev, "reset", - GPIOD_OUT_LOW); - if (IS_ERR(reset_gpios)) - return PTR_ERR(reset_gpios); - /* Disable the interrupt if the PHY doesn't support it * but the interrupt is still a valid one */ -- cgit v0.10.2