GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-17 20:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: ftgmac100: support getting MAC address from NVMEM

Browse source 
Make use of of_get_ethdev_address() to support reading MAC address not
only from the usual DT nodes but also from an NVMEM provider (e.g. using
a dedicated area in an FRU EEPROM).

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Link: https://lore.kernel.org/r/20230713095743.30517-1-fercerpav@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Paul Fertser 2023-07-13 12:57:43 +03:00 • committed by Paolo Abeni
parent 60cc1f7d06
commit 2cee73cef2
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/net/ethernet/faraday/ftgmac100.c
View file

@ -177,16 +177,20 @@ static void ftgmac100_write_mac_addr(struct ftgmac100 *priv, const u8 *mac)
iowrite32(laddr, priv->base + FTGMAC100_OFFSET_MAC_LADR);
}
static void ftgmac100_initial_mac(struct ftgmac100 *priv)
static int ftgmac100_initial_mac(struct ftgmac100 *priv)
{
u8 mac[ETH_ALEN];
unsigned int m;
unsigned int l;
int err;
if (!device_get_ethdev_address(priv->dev, priv->netdev)) {
err = of_get_ethdev_address(priv->dev->of_node, priv->netdev);
if (err == -EPROBE_DEFER)
return err;
if (!err) {
dev_info(priv->dev, "Read MAC address %pM from device tree\n",
priv->netdev->dev_addr);
return;
return 0;
}
m = ioread32(priv->base + FTGMAC100_OFFSET_MAC_MADR);
@ -207,6 +211,8 @@ static void ftgmac100_initial_mac(struct ftgmac100 *priv)
dev_info(priv->dev, "Generated random MAC address %pM\n",
priv->netdev->dev_addr);
}
return 0;
}
static int ftgmac100_set_mac_addr(struct net_device *dev, void *p)
@ -1843,7 +1849,9 @@ static int ftgmac100_probe(struct platform_device *pdev)
priv->aneg_pause = true;
/* MAC address from chip or random one */
ftgmac100_initial_mac(priv);
err = ftgmac100_initial_mac(priv);
if (err)
goto err_phy_connect;
np = pdev->dev.of_node;
if (np && (of_device_is_compatible(np, "aspeed,ast2400-mac") ||