net: davinci_emac: use nvmem_get_mac_address()
All DaVinci boards still supported in board files now define nvmem cells containing the MAC address. We want to stop using the setup callback from at24 so the MAC address for those users will no longer be provided over platform data. If we didn't get a valid MAC in pdata, try nvmem before resorting to a random MAC. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
afa64a72b8
Коммит
18dbfc81de
|
@ -1912,11 +1912,15 @@ static int davinci_emac_probe(struct platform_device *pdev)
|
|||
ether_addr_copy(ndev->dev_addr, priv->mac_addr);
|
||||
|
||||
if (!is_valid_ether_addr(priv->mac_addr)) {
|
||||
/* Use random MAC if none passed */
|
||||
eth_hw_addr_random(ndev);
|
||||
memcpy(priv->mac_addr, ndev->dev_addr, ndev->addr_len);
|
||||
dev_warn(&pdev->dev, "using random MAC addr: %pM\n",
|
||||
priv->mac_addr);
|
||||
/* Try nvmem if MAC wasn't passed over pdata or DT. */
|
||||
rc = nvmem_get_mac_address(&pdev->dev, priv->mac_addr);
|
||||
if (rc) {
|
||||
/* Use random MAC if still none obtained. */
|
||||
eth_hw_addr_random(ndev);
|
||||
memcpy(priv->mac_addr, ndev->dev_addr, ndev->addr_len);
|
||||
dev_warn(&pdev->dev, "using random MAC addr: %pM\n",
|
||||
priv->mac_addr);
|
||||
}
|
||||
}
|
||||
|
||||
ndev->netdev_ops = &emac_netdev_ops;
|
||||
|
|
Загрузка…
Ссылка в новой задаче