Skip to content

Commit 9483501

Browse files
Fabio Estevamdavem330
authored andcommitted
Revert "phy: add support for a reset-gpio specification"
Commit da47b45 ("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 da47b45. Reported-by: Guenter Roeck <[email protected]> Signed-off-by: Fabio Estevam <[email protected]> Acked-by: Florian Fainelli <[email protected]> Tested-by: Guenter Roeck <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c0fcded commit 9483501

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

Documentation/devicetree/bindings/net/phy.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,11 @@ Optional Properties:
3535
- broken-turn-around: If set, indicates the PHY device does not correctly
3636
release the turn around line low at the end of a MDIO transaction.
3737

38-
- reset-gpios: Reference to a GPIO used to reset the phy.
39-
4038
Example:
4139

4240
ethernet-phy@0 {
4341
compatible = "ethernet-phy-id0141.0e90", "ethernet-phy-ieee802.3-c22";
4442
interrupt-parent = <40000>;
4543
interrupts = <35 1>;
4644
reg = <0>;
47-
reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
4845
};

drivers/net/phy/phy_device.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <linux/io.h>
3535
#include <linux/uaccess.h>
3636
#include <linux/of.h>
37-
#include <linux/gpio/consumer.h>
3837

3938
#include <asm/irq.h>
4039

@@ -1571,16 +1570,9 @@ static int phy_probe(struct device *dev)
15711570
struct device_driver *drv = phydev->mdio.dev.driver;
15721571
struct phy_driver *phydrv = to_phy_driver(drv);
15731572
int err = 0;
1574-
struct gpio_descs *reset_gpios;
15751573

15761574
phydev->drv = phydrv;
15771575

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-
15841576
/* Disable the interrupt if the PHY doesn't support it
15851577
* but the interrupt is still a valid one
15861578
*/

0 commit comments

Comments
 (0)