diff options
| author | Madalin Bucur <madalin.bucur@oss.nxp.com> | 2020-03-05 19:08:57 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-08 22:02:54 -0700 |
| commit | f3353b99022583cc17142146cdc4dd6a770fbc7f (patch) | |
| tree | 7e4381ae0eb16f1e3ccee1ea8ed01edb4398d705 /drivers/net/ethernet/freescale/fman/fman_memac.c | |
| parent | 6b995bdefc10b47e4d443b3a5dafb92f5bb09268 (diff) | |
fsl/fman: tolerate missing MAC address in device tree
Allow the initialization of the MAC to be performed even if the
device tree does not provide a valid MAC address. Later a random
MAC address should be assigned by the Ethernet driver.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Madalin Bucur <madalin.bucur@oss.nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/fman_memac.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/fman_memac.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c index e1901874c19f..f2b2bfcbb529 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c @@ -596,10 +596,6 @@ static void setup_sgmii_internal_phy_base_x(struct fman_mac *memac) static int check_init_parameters(struct fman_mac *memac) { - if (memac->addr == 0) { - pr_err("Ethernet MAC must have a valid MAC address\n"); - return -EINVAL; - } if (!memac->exception_cb) { pr_err("Uninitialized exception handler\n"); return -EINVAL; @@ -1057,8 +1053,10 @@ int memac_init(struct fman_mac *memac) } /* MAC Address */ - MAKE_ENET_ADDR_FROM_UINT64(memac->addr, eth_addr); - add_addr_in_paddr(memac->regs, (u8 *)eth_addr, 0); + if (memac->addr != 0) { + MAKE_ENET_ADDR_FROM_UINT64(memac->addr, eth_addr); + add_addr_in_paddr(memac->regs, (u8 *)eth_addr, 0); + } fixed_link = memac_drv_param->fixed_link; |