commit d422d5c4a395f034b26f223c69c6c33b6423cec1
author Marek Vasut <marek.vasut+renesas@gmail.com> Mon Jun 18 04:02:15 2018 +0200
committer Marek Vasut <marek.vasut+renesas@gmail.com> Tue Jun 19 06:15:55 2018 +0200
tree 58d94e8c09349d2dbad88118335993aa5f83432b
parent 882294d49d53b5f43ef5611eeeab87203218afb9

net: ravb: Support reset GPIO both in mac and phy node

The recent DTs have the PHY reset GPIO in the PHY node rather than
the ethernet MAC node, support extracting the PHY reset GPIO info
from both the PHY node and ethernet MAC node.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Joe Hershberger <joe.hershberger@ni.com>

drivers/net/ravb.c

diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index 0dd2792..749562d 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -466,6 +466,7 @@
 {
 	struct eth_pdata *pdata = dev_get_platdata(dev);
 	struct ravb_priv *eth = dev_get_priv(dev);
+	struct ofnode_phandle_args phandle_args;
 	struct mii_dev *mdiodev;
 	void __iomem *iobase;
 	int ret;
@@ -477,8 +478,16 @@
 	if (ret < 0)
 		goto err_mdio_alloc;
 
-	gpio_request_by_name(dev, "reset-gpios", 0, &eth->reset_gpio,
-			     GPIOD_IS_OUT);
+	ret = dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, &phandle_args);
+	if (!ret) {
+		gpio_request_by_name_nodev(phandle_args.node, "reset-gpios", 0,
+					   &eth->reset_gpio, GPIOD_IS_OUT);
+	}
+
+	if (!dm_gpio_is_valid(&eth->reset_gpio)) {
+		gpio_request_by_name(dev, "reset-gpios", 0, &eth->reset_gpio,
+				     GPIOD_IS_OUT);
+	}
 
 	mdiodev = mdio_alloc();
 	if (!mdiodev) {