summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mach-imx7d.c
diff options
context:
space:
mode:
authorFugang Duan <b38611@freescale.com>2014-10-15 09:36:40 +0800
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-23 16:42:31 +0300
commit8b2b3d649d3e3d937271767de9f9d621a8fc6203 (patch)
tree9eaf99a3f01ca669e09eb3120d3ee1c598b8ac54 /arch/arm/mach-imx/mach-imx7d.c
parentd464a00029f6edc6fd80b7ee13984849dbe08c28 (diff)
MLK-9694 ARM: imx6: init enet MAC address
Enet get MAC address order: From module parameters or kernel command line -> device tree -> pfuse -> mac registers set by bootloader -> random mac address. When there have no "fec.macaddr" parameters set in kernel command line, enet driver get MAC address from device tree. And then if the MAC address set in device tree and is valid, enet driver get MAC address from device tree. Otherwise,enet get MAarch/arm/mach-imx /mach-imx6q.cC address from pfuse. So, in the condition, update the MAC address (read from pfuse) to device tree. Cherry-pick & Merge patches from: 149ac988a25b8d8eb86d05679cbb7b42819ff7a1 & 3269e5c06bdb2f7ab9bd5afa9bbfe46d872197d3 Signed-off-by: Fugang Duan <B38611@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx/mach-imx7d.c')
-rw-r--r--arch/arm/mach-imx/mach-imx7d.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx7d.c b/arch/arm/mach-imx/mach-imx7d.c
index 8b9b8cbfae30..fd04c4a3eb2d 100644
--- a/arch/arm/mach-imx/mach-imx7d.c
+++ b/arch/arm/mach-imx/mach-imx7d.c
@@ -81,6 +81,7 @@ static void __init imx7d_enet_clk_sel(void)
static inline void imx7d_enet_init(void)
{
+ imx6_enet_mac_init("fsl,imx7d-fec", "fsl,imx7d-ocotp");
imx7d_enet_phy_init();
imx7d_enet_clk_sel();
}