diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-30 14:59:43 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-30 14:59:43 +0800 |
| commit | 23172ac2741db6123f1d9acd346759aa2a57e41f (patch) | |
| tree | cddb1f36eefded1118049fd70495204d72567581 /drivers/of | |
| parent | 06e362153465dc6116114156382348df97a35d8e (diff) | |
| parent | 0d9a88c0890a57ea1cfa04f9c33436911e9fe07e (diff) | |
Merge remote-tracking branch 'origin/net/fec' into net/next
* origin/net/fec: (14 commits)
MLK-24341 net: fec: fix the uninitialized variable in fec_resume()
LF-289 net: fec: request pmqos during low power
net: fec: Add initial s32v234 support
net: fec: avoid imx_sc_misc_set_control() is called at atomic context
MLK-11051 net: phy: mdio_bus: don't call .phy_suspendi() when netdev is NULL
...
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/of_net.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c index dbac3a172a11..17299777435b 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -140,6 +140,10 @@ int of_get_mac_address(struct device_node *np, u8 *addr) if (!ret) return 0; + ret = of_get_mac_addr(np, "nvmem-mac-address", addr); + if (!ret) + return 0; + return of_get_mac_addr_nvmem(np, addr); } EXPORT_SYMBOL(of_get_mac_address); |