LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: fec: sharing MDIO for two enet controllers 

On i.MX6SX, 6UL and 7D, there are two enet controllers each has a
MDIO port. But Some boards share one MDIO port for the two enets. So
introduce a configuration CONFIG_FEC_MXC_MDIO_BASE to indicate
the MDIO port for sharing.
In Kconfig, user needs enable CONFIG_FEC_MXC_SHARE_MDIO first to enter
the CONFIG_FEC_MXC_MDIO_BASE.

To i.MX28, adapt to use the new config

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
This commit is contained in:
Peng Fan 2018-03-21 17:01:50 +08:00 committed by Ye Li
parent a9b2da9b85
commit e9503232ee
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/Kconfig
View File

@ -147,9 +147,20 @@ config ETHOC
help help
This MAC is present in OpenRISC and Xtensa XTFPGA boards. This MAC is present in OpenRISC and Xtensa XTFPGA boards.
config FEC_MXC_SHARE_MDIO
bool "Share the MDIO bus for FEC controller"
depends on FEC_MXC
config FEC_MXC_MDIO_BASE
hex "MDIO base address for the FEC controller"
depends on FEC_MXC_SHARE_MDIO
help
This specifies the MDIO registers base address. It is used when
two FEC controllers share MDIO bus.
config FEC_MXC config FEC_MXC
bool "FEC Ethernet controller" bool "FEC Ethernet controller"
depends on MX5 || MX6 depends on MX5 || MX6 || MX7
help help
This driver supports the 10/100 Fast Ethernet controller for This driver supports the 10/100 Fast Ethernet controller for
NXP i.MX processors. NXP i.MX processors.

8
drivers/net/fec_mxc.c
View File

@ -1145,12 +1145,12 @@ int fecmxc_initialize_multi(bd_t *bd, int dev_id, int phy_id, uint32_t addr)
#endif #endif
int ret; int ret;
#ifdef CONFIG_MX28 #ifdef CONFIG_FEC_MXC_MDIO_BASE
/* /*
* The i.MX28 has two ethernet interfaces, but they are not equal. * The i.MX28 has two ethernet interfaces, but they are not equal.
* Only the first one can access the MDIO bus. * Only the first one can access the MDIO bus.
*/ */
base_mii = MXS_ENET0_BASE; base_mii = CONFIG_FEC_MXC_MDIO_BASE;
#else #else
base_mii = addr; base_mii = addr;
#endif #endif
@ -1272,7 +1272,11 @@ static int fecmxc_probe(struct udevice *dev)
fec_reg_setup(priv); fec_reg_setup(priv);
priv->dev_id = dev->seq; priv->dev_id = dev->seq;
#ifdef CONFIG_FEC_MXC_MDIO_BASE
bus = fec_get_miibus((ulong)CONFIG_FEC_MXC_MDIO_BASE, dev->seq);
#else
bus = fec_get_miibus((ulong)priv->eth, dev->seq); bus = fec_get_miibus((ulong)priv->eth, dev->seq);
#endif
if (!bus) { if (!bus) {
ret = -ENOMEM; ret = -ENOMEM;
goto err_mii; goto err_mii;

1
include/configs/mx28evk.h
View File

@ -65,6 +65,7 @@
/* FEC Ethernet on SoC */ /* FEC Ethernet on SoC */
#ifdef CONFIG_CMD_NET #ifdef CONFIG_CMD_NET
#define CONFIG_FEC_MXC #define CONFIG_FEC_MXC
#define CONFIG_FEC_MXC_MDIO_BASE MXS_ENET0_BASE
#define CONFIG_MX28_FEC_MAC_IN_OCOTP #define CONFIG_MX28_FEC_MAC_IN_OCOTP
#endif #endif