Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94835014 authored by Fabio Estevam's avatar Fabio Estevam Committed by David S. Miller
Browse files

Revert "phy: add support for a reset-gpio specification" 



Commit da47b457 ("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 da47b457.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0fcded2

Documentation/devicetree/bindings/net/phy.txt

+0 −3
Original line number Diff line number Diff line
@@ -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>;

};

drivers/net/phy/phy_device.c

+0 −8
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <linux/io.h>

#include <linux/uaccess.h>

#include <linux/of.h>

#include <linux/gpio/consumer.h>



#include <asm/irq.h>
@@ -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

	 */