From 0cf4630cd277e2a71340c47262cd66c930b0d541 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 15 May 2014 09:56:35 +0200 Subject: [PATCH] net: take eth id from devicetree alias If the devicetree has an alias for the ethernet device, then use it. Signed-off-by: Sascha Hauer --- net/eth.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/net/eth.c b/net/eth.c index 26a5ff747..b830f7924 100644 --- a/net/eth.c +++ b/net/eth.c @@ -330,12 +330,21 @@ int eth_register(struct eth_device *edev) } strcpy(edev->dev.name, "eth"); - edev->dev.id = DEVICE_ID_DYNAMIC; if (edev->parent) edev->dev.parent = edev->parent; - register_device(&edev->dev); + if (edev->dev.parent && edev->dev.parent->device_node) { + edev->dev.id = of_alias_get_id(edev->dev.parent->device_node, "ethernet"); + if (edev->dev.id < 0) + edev->dev.id = DEVICE_ID_DYNAMIC; + } else { + edev->dev.id = DEVICE_ID_DYNAMIC; + } + + ret = register_device(&edev->dev); + if (ret) + return ret; dev_add_param_ip(dev, "ipaddr", NULL, NULL, &edev->ipaddr, edev); dev_add_param_ip(dev, "serverip", NULL, NULL, &edev->serverip, edev);