On 03.11.21 11:19, Clément Léger wrote: > Add support to get mac from device-tree using of_get_mac_address. > > Signed-off-by: Clément Léger <clement.leger@xxxxxxxxxxx> > --- > drivers/net/ethernet/mscc/ocelot_net.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c > index eaeba60b1bba..d76def435b23 100644 > --- a/drivers/net/ethernet/mscc/ocelot_net.c > +++ b/drivers/net/ethernet/mscc/ocelot_net.c > @@ -1704,7 +1704,10 @@ int ocelot_probe_port(struct ocelot *ocelot, int port, struct regmap *target, > NETIF_F_HW_TC; > dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_TC; > > - eth_hw_addr_gen(dev, ocelot->base_mac, port); > + err = of_get_mac_address(portnp, dev->dev_addr); of_get_ethdev_address() maybe, so that this gets routed through Jakub's fancy new eth_hw_addr_set() infrastructure? > + if (err) > + eth_hw_addr_gen(dev, ocelot->base_mac, port); > + > ocelot_mact_learn(ocelot, PGID_CPU, dev->dev_addr, > OCELOT_VLAN_UNAWARE_PVID, ENTRYTYPE_LOCKED); > >
