| Message ID | 1629110672-28374-1-git-send-email-ye.li@nxp.com |
|---|---|
| State | Accepted |
| Commit | 6daa6a97d11875ea44bbaab1d21d03e927c4fd72 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [1/7] arm: mach-imx: Update MAC fuse for i.MX8MP | expand |
On Mon, 2021-08-16 at 18:44 +0800, Ye Li wrote: > i.MX8MP has two ENET controllers, have to update the function to > enable loading two MAC addresses. > > Signed-off-by: Ye Li <ye.li@nxp.com> Whole series. Tested on iMX8MP_EVK and Verdin iMX8M Plus on Verdin development board. Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> I will post the Verdin iMX8M Plus support shortly. > --- > arch/arm/mach-imx/mac.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c > index 3b1496b..9bb63d2 100644 > --- a/arch/arm/mach-imx/mac.c > +++ b/arch/arm/mach-imx/mac.c > @@ -31,7 +31,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) > > offset = is_mx6() ? MAC_FUSE_MX6_OFFSET : MAC_FUSE_MX7_OFFSET; > fuse = (struct imx_mac_fuse *)(ulong)(OCOTP_BASE_ADDR + offset); > - has_second_mac = is_mx7() || is_mx6sx() || is_mx6ul() || is_mx6ull(); > + has_second_mac = is_mx7() || is_mx6sx() || is_mx6ul() || is_mx6ull() || is_imx8mp(); > > if (has_second_mac && dev_id == 1) { > u32 value = readl(&fuse->mac_addr2);
> i.MX8MP has two ENET controllers, have to update the function to > enable loading two MAC addresses. > Signed-off-by: Ye Li <ye.li@nxp.com> > Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c index 3b1496b..9bb63d2 100644 --- a/arch/arm/mach-imx/mac.c +++ b/arch/arm/mach-imx/mac.c @@ -31,7 +31,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) offset = is_mx6() ? MAC_FUSE_MX6_OFFSET : MAC_FUSE_MX7_OFFSET; fuse = (struct imx_mac_fuse *)(ulong)(OCOTP_BASE_ADDR + offset); - has_second_mac = is_mx7() || is_mx6sx() || is_mx6ul() || is_mx6ull(); + has_second_mac = is_mx7() || is_mx6sx() || is_mx6ul() || is_mx6ull() || is_imx8mp(); if (has_second_mac && dev_id == 1) { u32 value = readl(&fuse->mac_addr2);
i.MX8MP has two ENET controllers, have to update the function to enable loading two MAC addresses. Signed-off-by: Ye Li <ye.li@nxp.com> --- arch/arm/mach-imx/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)