From 10e6479325ce46aa3f670bad4a127b194dcd60c2 Mon Sep 17 00:00:00 2001

From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

Date: Wed, 20 Jun 2018 10:03:56 +0200

Subject: [PATCH 4/7] net: davinci_emac: match the mdio device against its

 compatible if possible

References: git-fixes

Patch-mainline: v4.18-rc3

Git-commit: ea0820bb771175c7d4192fc6f5b5c56b3c6d5239

Device tree based systems without of_dev_auxdata will have the mdio

device named differently than "davinci_mdio(.0)". In this case use the

device's parent's compatible string for matching

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

 drivers/net/ethernet/ti/davinci_emac.c | 4 ++++

 1 file changed, 4 insertions(+)

diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c

index ab2c7bad7089..0fc5a15f2b8a 100644

--- a/drivers/net/ethernet/ti/davinci_emac.c

+++ b/drivers/net/ethernet/ti/davinci_emac.c

@@ -1387,6 +1387,10 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd)

 static int match_first_device(struct device *dev, void *data)

 {

+	if (dev->parent && dev->parent->of_node)

+		return of_device_is_compatible(dev->parent->of_node,

+					       "ti,davinci_mdio");

+

 	return !strncmp(dev_name(dev), "davinci_mdio", 12);

 }

-- 

2.16.4