MLK-13602-3 mx6ullevk: Enable module fuse checking for mx6ull boards

Enable the module disable fuse checking configurations, and ENET fuse checking during
ENET setup.

Signed-off-by: Ye Li <ye.li@nxp.com>
Tested-by: Bai Ping <ping.bai@nxp.com>
(cherry picked from commit d2192a3909be8ab9433082e7c04c917489b28e25)
(cherry picked from commit 5fa7d431db1c5eda903f211a99c426d8d57293bd)
(cherry picked from commit 5fc6fe6b0f85f61bc60712af5b8cd55e7b8b0789)
(cherry picked from commit 522748cbcfc2ddd5a3490fe74683926048ff099d)
(cherry picked from commit 176e91bcdc49025cf127b4226ec0e2476ebafdf0)
(cherry picked from commit 9c42a6b549b1f5bc84fff10f0590e94111771422)

diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 8495387..1be8e03 100644 (file)
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -530,6 +530,8 @@ config TARGET_MX6ULL_9X9_EVK
        select BOARD_LATE_INIT
        select DM
        select DM_THERMAL
+       select IMX_MODULE_FUSE
+       select OF_SYSTEM_SETUP
        imply CMD_DM
 
 config TARGET_MX6ULL_14X14_EVK
@@ -538,6 +540,8 @@ config TARGET_MX6ULL_14X14_EVK
        select BOARD_LATE_INIT
        select DM
        select DM_THERMAL
+       select IMX_MODULE_FUSE
+       select OF_SYSTEM_SETUP
        imply CMD_DM
 
 config TARGET_MYS_6ULX

diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 99b54f4..e5587b0 100644 (file)
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -223,16 +223,20 @@ static int setup_fec(void)
         * Use 50M anatop loopback REF_CLK2 for ENET2,
         * clear gpr1[14], set gpr1[18].
         */
-       clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC2_MASK,
-                       IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK);
+       if (!check_module_fused(MODULE_ENET2)) {
+               clrsetbits_le32(&iomuxc_regs->gpr[1], IOMUX_GPR1_FEC2_MASK,
+                               IOMUX_GPR1_FEC2_CLOCK_MUX1_SEL_MASK);
+       }
 
        ret = enable_fec_anatop_clock(0, ENET_50MHZ);
        if (ret)
                return ret;
 
-       ret = enable_fec_anatop_clock(1, ENET_50MHZ);
-       if (ret)
-               return ret;
+       if (!check_module_fused(MODULE_ENET2)) {
+               ret = enable_fec_anatop_clock(1, ENET_50MHZ);
+               if (ret)
+                       return ret;
+       }
 
        enable_enet_clk(1);