MLK-23574-30 mx7dsabresd: Support two ethernet ports

Enable the fec2 port by enabling its DTS node and clocks.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit db179a361159ddc9555fa3616040b750ae73440b)

diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
index b78358f..a99c087 100644 (file)
--- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi
+++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi
@@ -1,7 +1,3 @@
-&fec2 {
-       status = "disable";
-};
-
 &usbotg1 {
        dr_mode = "peripheral";
 };

diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c
index 2777ae1..911120c 100644 (file)
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/freescale/mx7dsabresd/mx7dsabresd.c
@@ -199,6 +199,10 @@ static int setup_fec(void)
                (IOMUXC_GPR_GPR1_GPR_ENET1_TX_CLK_SEL_MASK |
                 IOMUXC_GPR_GPR1_GPR_ENET1_CLK_DIR_MASK), 0);
 
+       clrsetbits_le32(&iomuxc_gpr_regs->gpr[1],
+                       (IOMUXC_GPR_GPR1_GPR_ENET2_TX_CLK_SEL_MASK |
+                        IOMUXC_GPR_GPR1_GPR_ENET2_CLK_DIR_MASK), 0);
+
        return set_clk_enet(ENET_125MHZ);
 }
 

diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index 3687a65..098151c 100644 (file)
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -53,8 +53,7 @@ CONFIG_FSL_USDHC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_DM_ETH=y
-CONFIG_DM_MDIO=y
-CONFIG_DM_MDIO_MUX=y
+CONFIG_DM_ETH_PHY=y
 CONFIG_FEC_MXC=y
 CONFIG_RGMII=y
 CONFIG_MII=y

diff --git a/configs/mx7dsabresd_qspi_defconfig b/configs/mx7dsabresd_qspi_defconfig
index c216b8c..ba23a13 100644 (file)
--- a/configs/mx7dsabresd_qspi_defconfig
+++ b/configs/mx7dsabresd_qspi_defconfig
@@ -59,8 +59,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_DM_ETH=y
-CONFIG_DM_MDIO=y
-CONFIG_DM_MDIO_MUX=y
+CONFIG_DM_ETH_PHY=y
 CONFIG_FEC_MXC=y
 CONFIG_RGMII=y
 CONFIG_MII=y

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 5801da0..069ae36 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -20,6 +20,9 @@
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
+/* Default ETH port */
+#define CONFIG_ETHPRIME                 "eth0"
+
 /* I2C configs */
 #define CONFIG_SYS_I2C_MXC
 #define CONFIG_SYS_I2C_SPEED           100000