Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-20 22:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA

Browse source 
Rename constant PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA to make
it compatible with Linux' naming.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
This commit is contained in:
Marek Behún 2022-04-07 00:33:03 +02:00 committed by Ramon Fried
parent 6706d7dcbe
commit ffb0f6f488
61 changed files with 105 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/freescale/corenet_ds/eth_hydra.c
View file

@ -471,7 +471,7 @@ int board_eth_init(struct bd_info *bis)
fm_info_set_mdio(i, fm_info_set_mdio(i,
miiphy_get_dev_by_name("HYDRA_RGMII_MDIO")); miiphy_get_dev_by_name("HYDRA_RGMII_MDIO"));
break; break;
case PHY_INTERFACE_MODE_NONE: case PHY_INTERFACE_MODE_NA:
fm_info_set_phy_address(i, 0); fm_info_set_phy_address(i, 0);
break; break;
default: default:

4
board/freescale/corenet_ds/eth_superhydra.c
View file

@ -583,7 +583,7 @@ int board_eth_init(struct bd_info *bis)
fm_info_set_mdio(i, fm_info_set_mdio(i,
miiphy_get_dev_by_name("SUPER_HYDRA_RGMII_MDIO")); miiphy_get_dev_by_name("SUPER_HYDRA_RGMII_MDIO"));
break; break;
case PHY_INTERFACE_MODE_NONE: case PHY_INTERFACE_MODE_NA:
fm_info_set_phy_address(i, 0); fm_info_set_phy_address(i, 0);
break; break;
default: default:
@ -733,7 +733,7 @@ int board_eth_init(struct bd_info *bis)
fm_info_set_mdio(i, fm_info_set_mdio(i,
miiphy_get_dev_by_name("SUPER_HYDRA_RGMII_MDIO")); miiphy_get_dev_by_name("SUPER_HYDRA_RGMII_MDIO"));
break; break;
case PHY_INTERFACE_MODE_NONE: case PHY_INTERFACE_MODE_NA:
fm_info_set_phy_address(i, 0); fm_info_set_phy_address(i, 0);
break; break;
default: default:

4
board/freescale/t104xrdb/eth.c
View file

@ -89,7 +89,7 @@ int board_eth_init(struct bd_info *bis)
case PHY_INTERFACE_MODE_QSGMII: case PHY_INTERFACE_MODE_QSGMII:
fm_info_set_phy_address(i, 0); fm_info_set_phy_address(i, 0);
break; break;
case PHY_INTERFACE_MODE_NONE: case PHY_INTERFACE_MODE_NA:
fm_info_set_phy_address(i, 0); fm_info_set_phy_address(i, 0);
break; break;
default: default:
@ -99,7 +99,7 @@ int board_eth_init(struct bd_info *bis)
break; break;
} }
if (fm_info_get_enet_if(i) == PHY_INTERFACE_MODE_QSGMII || if (fm_info_get_enet_if(i) == PHY_INTERFACE_MODE_QSGMII ||
fm_info_get_enet_if(i) == PHY_INTERFACE_MODE_NONE) fm_info_get_enet_if(i) == PHY_INTERFACE_MODE_NA)
fm_info_set_mdio(i, NULL); fm_info_set_mdio(i, NULL);
else else
fm_info_set_mdio(i, fm_info_set_mdio(i,

4
drivers/core/ofnode.c
View file

@ -1232,7 +1232,7 @@ phy_interface_t ofnode_read_phy_mode(ofnode node)
mode = ofnode_read_string(node, "phy-connection-type"); mode = ofnode_read_string(node, "phy-connection-type");
if (!mode) if (!mode)
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++)
if (!strcmp(mode, phy_interface_strings[i])) if (!strcmp(mode, phy_interface_strings[i]))
@ -1240,5 +1240,5 @@ phy_interface_t ofnode_read_phy_mode(ofnode node)
debug("%s: Invalid PHY interface '%s'\n", __func__, mode); debug("%s: Invalid PHY interface '%s'\n", __func__, mode);
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

2
drivers/net/ag7xxx.c
View file

@ -1265,7 +1265,7 @@ static int ag7xxx_eth_of_to_plat(struct udevice *dev)
return ret; return ret;
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
return 0; return 0;

2
drivers/net/altera_tse.c
View file

@ -678,7 +678,7 @@ static int altera_tse_of_to_plat(struct udevice *dev)
struct eth_pdata *pdata = dev_get_plat(dev); struct eth_pdata *pdata = dev_get_plat(dev);
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
return 0; return 0;

2
drivers/net/bcm6348-eth.c
View file

@ -425,7 +425,7 @@ static int bcm6348_eth_probe(struct udevice *dev)
/* get phy mode */ /* get phy mode */
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -ENODEV; return -ENODEV;
/* get phy */ /* get phy */

2
drivers/net/bcmgenet.c
View file

@ -696,7 +696,7 @@ static int bcmgenet_eth_of_to_plat(struct udevice *dev)
/* Get phy mode from DT */ /* Get phy mode from DT */
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
ret = dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, ret = dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0,

2
drivers/net/designware.c
View file

@ -921,7 +921,7 @@ int designware_eth_of_to_plat(struct udevice *dev)
pdata->iobase = dev_read_addr(dev); pdata->iobase = dev_read_addr(dev);
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
pdata->max_speed = dev_read_u32_default(dev, "max-speed", 0); pdata->max_speed = dev_read_u32_default(dev, "max-speed", 0);

4
drivers/net/dwc_eth_qos.c
View file

@ -1682,7 +1682,7 @@ static int eqos_probe_resources_stm32(struct udevice *dev)
interface = eqos->config->interface(dev); interface = eqos->config->interface(dev);
if (interface == PHY_INTERFACE_MODE_NONE) { if (interface == PHY_INTERFACE_MODE_NA) {
pr_err("Invalid PHY interface\n"); pr_err("Invalid PHY interface\n");
return -EINVAL; return -EINVAL;
} }
@ -1743,7 +1743,7 @@ static int eqos_probe_resources_imx(struct udevice *dev)
interface = eqos->config->interface(dev); interface = eqos->config->interface(dev);
if (interface == PHY_INTERFACE_MODE_NONE) { if (interface == PHY_INTERFACE_MODE_NA) {
pr_err("Invalid PHY interface\n"); pr_err("Invalid PHY interface\n");
return -EINVAL; return -EINVAL;
} }

2
drivers/net/fec_mxc.c
View file

@ -1315,7 +1315,7 @@ static int fecmxc_of_to_plat(struct udevice *dev)
priv->eth = (struct ethernet_regs *)pdata->iobase; priv->eth = (struct ethernet_regs *)pdata->iobase;
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
#ifdef CONFIG_DM_REGULATOR #ifdef CONFIG_DM_REGULATOR

8
drivers/net/fm/b4860.c
View file

@ -55,7 +55,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
#endif #endif
if (is_device_disabled(port)) if (is_device_disabled(port))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
/*B4860 has two 10Gig Mac*/ /*B4860 has two 10Gig Mac*/
if ((port == FM1_10GEC1 || port == FM1_10GEC2) && if ((port == FM1_10GEC1 || port == FM1_10GEC2) &&
@ -112,7 +112,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
(port == FM1_DTSEC2) || (port == FM1_DTSEC2) ||
(port == FM1_DTSEC3) || (port == FM1_DTSEC3) ||
(port == FM1_DTSEC4)) (port == FM1_DTSEC4))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
} }
} }
@ -131,8 +131,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
return PHY_INTERFACE_MODE_SGMII; return PHY_INTERFACE_MODE_SGMII;
break; break;
default: default:
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

8
drivers/net/fm/init.c
View file

@ -130,7 +130,7 @@ static int fm_port_to_index(enum fm_port port)
/* /*
* Determine if an interface is actually active based on HW config * Determine if an interface is actually active based on HW config
* we expect fman_port_enet_if() to report PHY_INTERFACE_MODE_NONE if * we expect fman_port_enet_if() to report PHY_INTERFACE_MODE_NA if
* the interface is not active based on HW cfg of the SoC * the interface is not active based on HW cfg of the SoC
*/ */
void fman_enet_init(void) void fman_enet_init(void)
@ -141,7 +141,7 @@ void fman_enet_init(void)
phy_interface_t enet_if; phy_interface_t enet_if;
enet_if = fman_port_enet_if(fm_info[i].port); enet_if = fman_port_enet_if(fm_info[i].port);
if (enet_if != PHY_INTERFACE_MODE_NONE) { if (enet_if != PHY_INTERFACE_MODE_NA) {
fm_info[i].enabled = 1; fm_info[i].enabled = 1;
fm_info[i].enet_if = enet_if; fm_info[i].enet_if = enet_if;
} else { } else {
@ -221,12 +221,12 @@ phy_interface_t fm_info_get_enet_if(enum fm_port port)
int i = fm_port_to_index(port); int i = fm_port_to_index(port);
if (i == -1) if (i == -1)
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if (fm_info[i].enabled) if (fm_info[i].enabled)
return fm_info[i].enet_if; return fm_info[i].enet_if;
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
static void static void

6
drivers/net/fm/ls1043.c
View file

@ -54,13 +54,13 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
u32 rcwsr13 = in_be32(&gur->rcwsr[13]); u32 rcwsr13 = in_be32(&gur->rcwsr[13]);
if (is_device_disabled(port)) if (is_device_disabled(port))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if ((port == FM1_10GEC1) && (is_serdes_configured(XFI_FM1_MAC9))) if ((port == FM1_10GEC1) && (is_serdes_configured(XFI_FM1_MAC9)))
return PHY_INTERFACE_MODE_XGMII; return PHY_INTERFACE_MODE_XGMII;
if ((port == FM1_DTSEC9) && (is_serdes_configured(XFI_FM1_MAC9))) if ((port == FM1_DTSEC9) && (is_serdes_configured(XFI_FM1_MAC9)))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if (port == FM1_DTSEC3) if (port == FM1_DTSEC3)
if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) == if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) ==
@ -107,5 +107,5 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
break; break;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

8
drivers/net/fm/ls1046.c
View file

@ -54,19 +54,19 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
u32 rcwsr13 = in_be32(&gur->rcwsr[13]); u32 rcwsr13 = in_be32(&gur->rcwsr[13]);
if (is_device_disabled(port)) if (is_device_disabled(port))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if ((port == FM1_10GEC1) && (is_serdes_configured(XFI_FM1_MAC9))) if ((port == FM1_10GEC1) && (is_serdes_configured(XFI_FM1_MAC9)))
return PHY_INTERFACE_MODE_XGMII; return PHY_INTERFACE_MODE_XGMII;
if ((port == FM1_DTSEC9) && (is_serdes_configured(XFI_FM1_MAC9))) if ((port == FM1_DTSEC9) && (is_serdes_configured(XFI_FM1_MAC9)))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if ((port == FM1_10GEC2) && (is_serdes_configured(XFI_FM1_MAC10))) if ((port == FM1_10GEC2) && (is_serdes_configured(XFI_FM1_MAC10)))
return PHY_INTERFACE_MODE_XGMII; return PHY_INTERFACE_MODE_XGMII;
if ((port == FM1_DTSEC10) && (is_serdes_configured(XFI_FM1_MAC10))) if ((port == FM1_DTSEC10) && (is_serdes_configured(XFI_FM1_MAC10)))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if (port == FM1_DTSEC3) if (port == FM1_DTSEC3)
if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) == if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) ==
@ -118,5 +118,5 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
break; break;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

4
drivers/net/fm/p1023.c
View file

@ -46,7 +46,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
u32 pordevsr = in_be32(&gur->pordevsr); u32 pordevsr = in_be32(&gur->pordevsr);
if (is_device_disabled(port)) if (is_device_disabled(port))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
/* DTSEC1 can be SGMII, RGMII or RMII */ /* DTSEC1 can be SGMII, RGMII or RMII */
if (port == FM1_DTSEC1) { if (port == FM1_DTSEC1) {
@ -68,5 +68,5 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
return PHY_INTERFACE_MODE_RGMII; return PHY_INTERFACE_MODE_RGMII;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

6
drivers/net/fm/p4080.c
View file

@ -54,7 +54,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
u32 rcwsr11 = in_be32(&gur->rcwsr[11]); u32 rcwsr11 = in_be32(&gur->rcwsr[11]);
if (is_device_disabled(port)) if (is_device_disabled(port))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if ((port == FM1_10GEC1) && (is_serdes_configured(XAUI_FM1))) if ((port == FM1_10GEC1) && (is_serdes_configured(XAUI_FM1)))
return PHY_INTERFACE_MODE_XGMII; return PHY_INTERFACE_MODE_XGMII;
@ -91,8 +91,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
return PHY_INTERFACE_MODE_SGMII; return PHY_INTERFACE_MODE_SGMII;
break; break;
default: default:
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

6
drivers/net/fm/p5020.c
View file

@ -50,7 +50,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
u32 rcwsr11 = in_be32(&gur->rcwsr[11]); u32 rcwsr11 = in_be32(&gur->rcwsr[11]);
if (is_device_disabled(port)) if (is_device_disabled(port))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if ((port == FM1_10GEC1) && (is_serdes_configured(XAUI_FM1))) if ((port == FM1_10GEC1) && (is_serdes_configured(XAUI_FM1)))
return PHY_INTERFACE_MODE_XGMII; return PHY_INTERFACE_MODE_XGMII;
@ -82,8 +82,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
return PHY_INTERFACE_MODE_SGMII; return PHY_INTERFACE_MODE_SGMII;
break; break;
default: default:
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

6
drivers/net/fm/p5040.c
View file

@ -56,7 +56,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
u32 rcwsr11 = in_be32(&gur->rcwsr[11]); u32 rcwsr11 = in_be32(&gur->rcwsr[11]);
if (is_device_disabled(port)) if (is_device_disabled(port))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if ((port == FM1_10GEC1) && (is_serdes_configured(XAUI_FM1))) if ((port == FM1_10GEC1) && (is_serdes_configured(XAUI_FM1)))
return PHY_INTERFACE_MODE_XGMII; return PHY_INTERFACE_MODE_XGMII;
@ -99,8 +99,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
return PHY_INTERFACE_MODE_SGMII; return PHY_INTERFACE_MODE_SGMII;
break; break;
default: default:
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

4
drivers/net/fm/t1024.c
View file

@ -39,7 +39,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
u32 rcwsr13 = in_be32(&gur->rcwsr[13]); u32 rcwsr13 = in_be32(&gur->rcwsr[13]);
if (is_device_disabled(port)) if (is_device_disabled(port))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if ((port == FM1_10GEC1) && (is_serdes_configured(XFI_FM1_MAC1))) if ((port == FM1_10GEC1) && (is_serdes_configured(XFI_FM1_MAC1)))
return PHY_INTERFACE_MODE_XGMII; return PHY_INTERFACE_MODE_XGMII;
@ -83,5 +83,5 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
break; break;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

4
drivers/net/fm/t1040.c
View file

@ -56,8 +56,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
return PHY_INTERFACE_MODE_SGMII; return PHY_INTERFACE_MODE_SGMII;
break; break;
default: default:
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

6
drivers/net/fm/t2080.c
View file

@ -47,7 +47,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
u32 rcwsr13 = in_be32(&gur->rcwsr[13]); u32 rcwsr13 = in_be32(&gur->rcwsr[13]);
if (is_device_disabled(port)) if (is_device_disabled(port))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if ((port == FM1_10GEC1 || port == FM1_10GEC2) && if ((port == FM1_10GEC1 || port == FM1_10GEC2) &&
((is_serdes_configured(XAUI_FM1_MAC9)) || ((is_serdes_configured(XAUI_FM1_MAC9)) ||
@ -85,8 +85,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
return PHY_INTERFACE_MODE_SGMII; return PHY_INTERFACE_MODE_SGMII;
break; break;
default: default:
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

6
drivers/net/fm/t4240.c
View file

@ -61,7 +61,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
u32 rcwsr13 = in_be32(&gur->rcwsr[13]); u32 rcwsr13 = in_be32(&gur->rcwsr[13]);
if (is_device_disabled(port)) if (is_device_disabled(port))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if ((port == FM1_10GEC1 || port == FM1_10GEC2) && if ((port == FM1_10GEC1 || port == FM1_10GEC2) &&
((is_serdes_configured(XAUI_FM1_MAC9)) || ((is_serdes_configured(XAUI_FM1_MAC9)) ||
@ -73,7 +73,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
if ((port == FM1_DTSEC9 || port == FM1_DTSEC10) && if ((port == FM1_DTSEC9 || port == FM1_DTSEC10) &&
((is_serdes_configured(XFI_FM1_MAC9)) || ((is_serdes_configured(XFI_FM1_MAC9)) ||
(is_serdes_configured(XFI_FM1_MAC10)))) (is_serdes_configured(XFI_FM1_MAC10))))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if ((port == FM2_10GEC1 || port == FM2_10GEC2) && if ((port == FM2_10GEC1 || port == FM2_10GEC2) &&
((is_serdes_configured(XAUI_FM2_MAC9)) || ((is_serdes_configured(XAUI_FM2_MAC9)) ||
@ -166,5 +166,5 @@ phy_interface_t fman_port_enet_if(enum fm_port port)
break; break;
} }
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

2
drivers/net/fsl_enetc.c
View file

@ -277,7 +277,7 @@ static void enetc_start_pcs(struct udevice *dev)
} }
priv->if_type = dev_read_phy_mode(dev); priv->if_type = dev_read_phy_mode(dev);
if (priv->if_type == PHY_INTERFACE_MODE_NONE) { if (priv->if_type == PHY_INTERFACE_MODE_NA) {
enetc_dbg(dev, enetc_dbg(dev,
"phy-mode property not found, defaulting to SGMII\n"); "phy-mode property not found, defaulting to SGMII\n");
priv->if_type = PHY_INTERFACE_MODE_SGMII; priv->if_type = PHY_INTERFACE_MODE_SGMII;

2
drivers/net/ftgmac100.c
View file

@ -553,7 +553,7 @@ static int ftgmac100_of_to_plat(struct udevice *dev)
pdata->iobase = dev_read_addr(dev); pdata->iobase = dev_read_addr(dev);
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
pdata->max_speed = dev_read_u32_default(dev, "max-speed", 0); pdata->max_speed = dev_read_u32_default(dev, "max-speed", 0);

2
drivers/net/higmacv300.c
View file

@ -567,7 +567,7 @@ static int higmac_of_to_plat(struct udevice *dev)
priv->macif_ctrl = dev_remap_addr_index(dev, 1); priv->macif_ctrl = dev_remap_addr_index(dev, 1);
priv->phyintf = dev_read_phy_mode(dev); priv->phyintf = dev_read_phy_mode(dev);
if (priv->phyintf == PHY_INTERFACE_MODE_NONE) if (priv->phyintf == PHY_INTERFACE_MODE_NA)
return -ENODEV; return -ENODEV;
phy_node = dev_read_subnode(dev, "phy"); phy_node = dev_read_subnode(dev, "phy");

2
drivers/net/ldpaa_eth/ldpaa_eth.c
View file

@ -1127,7 +1127,7 @@ static int ldpaa_eth_bind(struct udevice *dev)
int phy_mode = -1; int phy_mode = -1;
phy_mode = dev_read_phy_mode(dev); phy_mode = dev_read_phy_mode(dev);
if (phy_mode == PHY_INTERFACE_MODE_NONE) { if (phy_mode == PHY_INTERFACE_MODE_NA) {
dev_err(dev, "incorrect phy mode\n"); dev_err(dev, "incorrect phy mode\n");
return -EINVAL; return -EINVAL;
} }

10
drivers/net/ldpaa_eth/ldpaa_wriop.c
View file

@ -16,7 +16,7 @@ struct wriop_dpmac_info dpmac_info[NUM_WRIOP_PORTS];
__weak phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtc) __weak phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtc)
{ {
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
void wriop_init_dpmac(int sd, int dpmac_id, int lane_prtcl) void wriop_init_dpmac(int sd, int dpmac_id, int lane_prtcl)
@ -26,10 +26,10 @@ void wriop_init_dpmac(int sd, int dpmac_id, int lane_prtcl)
dpmac_info[dpmac_id].enabled = 0; dpmac_info[dpmac_id].enabled = 0;
dpmac_info[dpmac_id].id = 0; dpmac_info[dpmac_id].id = 0;
dpmac_info[dpmac_id].enet_if = PHY_INTERFACE_MODE_NONE; dpmac_info[dpmac_id].enet_if = PHY_INTERFACE_MODE_NA;
enet_if = wriop_dpmac_enet_if(dpmac_id, lane_prtcl); enet_if = wriop_dpmac_enet_if(dpmac_id, lane_prtcl);
if (enet_if != PHY_INTERFACE_MODE_NONE) { if (enet_if != PHY_INTERFACE_MODE_NA) {
dpmac_info[dpmac_id].enabled = 1; dpmac_info[dpmac_id].enabled = 1;
dpmac_info[dpmac_id].id = dpmac_id; dpmac_info[dpmac_id].id = dpmac_id;
dpmac_info[dpmac_id].enet_if = enet_if; dpmac_info[dpmac_id].enet_if = enet_if;
@ -183,10 +183,10 @@ phy_interface_t wriop_get_enet_if(int dpmac_id)
int i = wriop_dpmac_to_index(dpmac_id); int i = wriop_dpmac_to_index(dpmac_id);
if (i == -1) if (i == -1)
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if (dpmac_info[i].enabled) if (dpmac_info[i].enabled)
return dpmac_info[i].enet_if; return dpmac_info[i].enet_if;
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }

4
drivers/net/ldpaa_eth/ls1088a.c
View file

@ -50,7 +50,7 @@ phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl)
enum srds_prtcl; enum srds_prtcl;
if (is_device_disabled(dpmac_id + 1)) if (is_device_disabled(dpmac_id + 1))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
switch (lane_prtcl) { switch (lane_prtcl) {
case SGMII1: case SGMII1:
@ -66,7 +66,7 @@ phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl)
if (lane_prtcl >= QSGMII_A && lane_prtcl <= QSGMII_B) if (lane_prtcl >= QSGMII_A && lane_prtcl <= QSGMII_B)
return PHY_INTERFACE_MODE_QSGMII; return PHY_INTERFACE_MODE_QSGMII;
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
void wriop_init_dpmac_qsgmii(int sd, int lane_prtcl) void wriop_init_dpmac_qsgmii(int sd, int lane_prtcl)

4
drivers/net/ldpaa_eth/ls2080a.c
View file

@ -62,7 +62,7 @@ phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl)
enum srds_prtcl; enum srds_prtcl;
if (is_device_disabled(dpmac_id + 1)) if (is_device_disabled(dpmac_id + 1))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if (lane_prtcl >= SGMII1 && lane_prtcl <= SGMII16) if (lane_prtcl >= SGMII1 && lane_prtcl <= SGMII16)
return PHY_INTERFACE_MODE_SGMII; return PHY_INTERFACE_MODE_SGMII;
@ -76,7 +76,7 @@ phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl)
if (lane_prtcl >= QSGMII_A && lane_prtcl <= QSGMII_D) if (lane_prtcl >= QSGMII_A && lane_prtcl <= QSGMII_D)
return PHY_INTERFACE_MODE_QSGMII; return PHY_INTERFACE_MODE_QSGMII;
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
void wriop_init_dpmac_qsgmii(int sd, int lane_prtcl) void wriop_init_dpmac_qsgmii(int sd, int lane_prtcl)

4
drivers/net/ldpaa_eth/lx2160a.c
View file

@ -58,7 +58,7 @@ phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl)
enum srds_prtcl; enum srds_prtcl;
if (is_device_disabled(dpmac_id)) if (is_device_disabled(dpmac_id))
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
if (lane_prtcl >= SGMII1 && lane_prtcl <= SGMII18) if (lane_prtcl >= SGMII1 && lane_prtcl <= SGMII18)
return PHY_INTERFACE_MODE_SGMII; return PHY_INTERFACE_MODE_SGMII;
@ -78,7 +78,7 @@ phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl)
if (lane_prtcl >= _100GE1 && lane_prtcl <= _100GE2) if (lane_prtcl >= _100GE1 && lane_prtcl <= _100GE2)
return PHY_INTERFACE_MODE_CAUI4; return PHY_INTERFACE_MODE_CAUI4;
return PHY_INTERFACE_MODE_NONE; return PHY_INTERFACE_MODE_NA;
} }
#ifdef CONFIG_SYS_FSL_HAS_RGMII #ifdef CONFIG_SYS_FSL_HAS_RGMII

2
drivers/net/macb.c
View file

@ -1363,7 +1363,7 @@ static int macb_eth_probe(struct udevice *dev)
int ret; int ret;
macb->phy_interface = dev_read_phy_mode(dev); macb->phy_interface = dev_read_phy_mode(dev);
if (macb->phy_interface == PHY_INTERFACE_MODE_NONE) if (macb->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
/* Read phyaddr from DT */ /* Read phyaddr from DT */

2
drivers/net/mscc_eswitch/jr2_switch.c
View file

@ -954,7 +954,7 @@ static int jr2_probe(struct udevice *dev)
phy = phy_connect(priv->ports[i].bus, phy = phy_connect(priv->ports[i].bus,
priv->ports[i].phy_addr, dev, priv->ports[i].phy_addr, dev,
PHY_INTERFACE_MODE_NONE); PHY_INTERFACE_MODE_NA);
if (phy) if (phy)
board_phy_config(phy); board_phy_config(phy);
} }

2
drivers/net/mscc_eswitch/luton_switch.c
View file

@ -685,7 +685,7 @@ static int luton_probe(struct udevice *dev)
phy = phy_connect(priv->ports[i].bus, phy = phy_connect(priv->ports[i].bus,
priv->ports[i].phy_addr, dev, priv->ports[i].phy_addr, dev,
PHY_INTERFACE_MODE_NONE); PHY_INTERFACE_MODE_NA);
if (phy && i >= MAX_INT_PORT) if (phy && i >= MAX_INT_PORT)
board_phy_config(phy); board_phy_config(phy);
} }

2
drivers/net/mscc_eswitch/ocelot_switch.c
View file

@ -608,7 +608,7 @@ static int ocelot_probe(struct udevice *dev)
phy = phy_connect(priv->ports[i].bus, phy = phy_connect(priv->ports[i].bus,
priv->ports[i].phy_addr, dev, priv->ports[i].phy_addr, dev,
PHY_INTERFACE_MODE_NONE); PHY_INTERFACE_MODE_NA);
if (phy && external_bus(priv, i)) if (phy && external_bus(priv, i))
board_phy_config(phy); board_phy_config(phy);
} }

2
drivers/net/mscc_eswitch/serval_switch.c
View file

@ -561,7 +561,7 @@ static int serval_probe(struct udevice *dev)
phy = phy_connect(priv->ports[i].bus, phy = phy_connect(priv->ports[i].bus,
priv->ports[i].phy_addr, dev, priv->ports[i].phy_addr, dev,
PHY_INTERFACE_MODE_NONE); PHY_INTERFACE_MODE_NA);
if (phy) if (phy)
board_phy_config(phy); board_phy_config(phy);
} }

2
drivers/net/mscc_eswitch/servalt_switch.c
View file

@ -482,7 +482,7 @@ static int servalt_probe(struct udevice *dev)
continue; continue;
phy_connect(priv->ports[i].bus, priv->ports[i].phy_addr, dev, phy_connect(priv->ports[i].bus, priv->ports[i].phy_addr, dev,
PHY_INTERFACE_MODE_NONE); PHY_INTERFACE_MODE_NA);
} }
return 0; return 0;

12
drivers/net/mt7620-eth.c
View file

@ -596,7 +596,7 @@ static int mt7620_setup_gmac_mode(struct mt7620_eth_priv *priv, u32 gmac,
case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII:
ge_mode = MT7620_SYSC_GE_RGMII; ge_mode = MT7620_SYSC_GE_RGMII;
break; break;
case PHY_INTERFACE_MODE_NONE: case PHY_INTERFACE_MODE_NA:
if (gmac == 2) if (gmac == 2)
ge_mode = MT7620_SYSC_GE_ESW_PHY; ge_mode = MT7620_SYSC_GE_ESW_PHY;
else else
@ -620,7 +620,7 @@ static void mt7620_gsw_setup_port(struct mt7620_eth_priv *priv, u32 port,
{ {
u32 pmcr; u32 pmcr;
if (port_cfg->mode == PHY_INTERFACE_MODE_NONE) { if (port_cfg->mode == PHY_INTERFACE_MODE_NA) {
if (port == 5) { if (port == 5) {
gsw_write(priv, GSW_PMCR(port), FORCE_MODE); gsw_write(priv, GSW_PMCR(port), FORCE_MODE);
return; return;
@ -666,7 +666,7 @@ static void mt7620_gsw_setup_phy_polling(struct mt7620_eth_priv *priv)
{ {
int phy_addr_st, phy_addr_end; int phy_addr_st, phy_addr_end;
if (priv->port_cfg[0].mode == PHY_INTERFACE_MODE_NONE) if (priv->port_cfg[0].mode == PHY_INTERFACE_MODE_NA)
priv->ephy_num = NUM_FE_PHYS; priv->ephy_num = NUM_FE_PHYS;
else else
priv->ephy_num = NUM_FE_PHYS - 1; priv->ephy_num = NUM_FE_PHYS - 1;
@ -1057,7 +1057,7 @@ static int mt7620_eth_parse_gsw_port(struct mt7620_eth_priv *priv, u32 idx,
case PHY_INTERFACE_MODE_MII: case PHY_INTERFACE_MODE_MII:
case PHY_INTERFACE_MODE_RMII: case PHY_INTERFACE_MODE_RMII:
case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII:
case PHY_INTERFACE_MODE_NONE: case PHY_INTERFACE_MODE_NA:
break; break;
default: default:
dev_err(priv->dev, "mt7620_eth: unsupported phy-mode\n"); dev_err(priv->dev, "mt7620_eth: unsupported phy-mode\n");
@ -1128,14 +1128,14 @@ static int mt7620_eth_parse_gsw_cfg(struct udevice *dev)
if (ret) if (ret)
return ret; return ret;
} else { } else {
priv->port_cfg[0].mode = PHY_INTERFACE_MODE_NONE; priv->port_cfg[0].mode = PHY_INTERFACE_MODE_NA;
} }
subnode = ofnode_find_subnode(dev_ofnode(dev), "port5"); subnode = ofnode_find_subnode(dev_ofnode(dev), "port5");
if (ofnode_valid(subnode)) if (ofnode_valid(subnode))
return mt7620_eth_parse_gsw_port(priv, 1, subnode); return mt7620_eth_parse_gsw_port(priv, 1, subnode);
priv->port_cfg[1].mode = PHY_INTERFACE_MODE_NONE; priv->port_cfg[1].mode = PHY_INTERFACE_MODE_NA;
return 0; return 0;
} }

2
drivers/net/mtk_eth.c
View file

@ -1449,7 +1449,7 @@ static int mtk_eth_of_to_plat(struct udevice *dev)
/* Interface mode is required */ /* Interface mode is required */
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
priv->phy_interface = pdata->phy_interface; priv->phy_interface = pdata->phy_interface;
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) { if (pdata->phy_interface == PHY_INTERFACE_MODE_NA) {
printf("error: phy-mode is not set\n"); printf("error: phy-mode is not set\n");
return -EINVAL; return -EINVAL;
} }

2
drivers/net/mvgbe.c
View file

@ -1005,7 +1005,7 @@ static int mvgbe_of_to_plat(struct udevice *dev)
/* Get phy-mode / phy_interface from DT */ /* Get phy-mode / phy_interface from DT */
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
pdata->phy_interface = PHY_INTERFACE_MODE_GMII; pdata->phy_interface = PHY_INTERFACE_MODE_GMII;
dmvgbe->phy_interface = pdata->phy_interface; dmvgbe->phy_interface = pdata->phy_interface;

2
drivers/net/mvneta.c
View file

@ -1804,7 +1804,7 @@ static int mvneta_of_to_plat(struct udevice *dev)
/* Get phy-mode / phy_interface from DT */ /* Get phy-mode / phy_interface from DT */
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
return 0; return 0;

2
drivers/net/mvpp2.c
View file

@ -4820,7 +4820,7 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port)
} }
port->phy_interface = dev_read_phy_mode(dev); port->phy_interface = dev_read_phy_mode(dev);
if (port->phy_interface == PHY_INTERFACE_MODE_NONE) { if (port->phy_interface == PHY_INTERFACE_MODE_NA) {
dev_err(dev, "incorrect phy mode\n"); dev_err(dev, "incorrect phy mode\n");
return -EINVAL; return -EINVAL;
} }

2
drivers/net/pic32_eth.c
View file

@ -550,7 +550,7 @@ static int pic32_eth_probe(struct udevice *dev)
/* get phy mode */ /* get phy mode */
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
/* get phy addr */ /* get phy addr */

2
drivers/net/qe/dm_qe_uec.c
View file

@ -1137,7 +1137,7 @@ static int qe_uec_of_to_plat(struct udevice *dev)
pdata->iobase = (phys_addr_t)devfdt_get_addr(dev); pdata->iobase = (phys_addr_t)devfdt_get_addr(dev);
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
return 0; return 0;

2
drivers/net/ravb.c
View file

@ -679,7 +679,7 @@ int ravb_of_to_plat(struct udevice *dev)
pdata->iobase = dev_read_addr(dev); pdata->iobase = dev_read_addr(dev);
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
pdata->max_speed = 1000; pdata->max_speed = 1000;

2
drivers/net/sh_eth.c
View file

@ -920,7 +920,7 @@ int sh_ether_of_to_plat(struct udevice *dev)
pdata->iobase = dev_read_addr(dev); pdata->iobase = dev_read_addr(dev);
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
pdata->max_speed = 1000; pdata->max_speed = 1000;

2
drivers/net/sni_ave.c
View file

@ -749,7 +749,7 @@ static int ave_of_to_plat(struct udevice *dev)
pdata->iobase = dev_read_addr(dev); pdata->iobase = dev_read_addr(dev);
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
pdata->max_speed = 0; pdata->max_speed = 0;

2
drivers/net/sni_netsec.c
View file

@ -1034,7 +1034,7 @@ static int netsec_of_to_plat(struct udevice *dev)
priv->eeprom_base = dev_read_addr_index(dev, 1) - EERPROM_MAP_OFFSET; priv->eeprom_base = dev_read_addr_index(dev, 1) - EERPROM_MAP_OFFSET;
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
if (!dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, if (!dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0,

2
drivers/net/sun8i_emac.c
View file

@ -947,7 +947,7 @@ static int sun8i_emac_eth_of_to_plat(struct udevice *dev)
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
printf("phy interface%d\n", pdata->phy_interface); printf("phy interface%d\n", pdata->phy_interface);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
if (priv->variant == H3_EMAC) { if (priv->variant == H3_EMAC) {

2
drivers/net/ti/am65-cpsw-nuss.c
View file

@ -607,7 +607,7 @@ static int am65_cpsw_ofdata_parse_phy(struct udevice *dev)
dev_read_u32(dev, "reg", &priv->port_id); dev_read_u32(dev, "reg", &priv->port_id);
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) { if (pdata->phy_interface == PHY_INTERFACE_MODE_NA) {
dev_err(dev, "Invalid PHY mode, port %u\n", priv->port_id); dev_err(dev, "Invalid PHY mode, port %u\n", priv->port_id);
return -EINVAL; return -EINVAL;
} }

2
drivers/net/ti/cpsw.c
View file

@ -1345,7 +1345,7 @@ static int cpsw_eth_of_to_plat(struct udevice *dev)
} }
pdata->phy_interface = data->slave_data[data->active_slave].phy_if; pdata->phy_interface = data->slave_data[data->active_slave].phy_if;
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
return 0; return 0;

2
drivers/net/ti/keystone_net.c
View file

@ -728,7 +728,7 @@ static int ks2_eth_parse_slave_interface(int netcp, int slave,
priv->has_mdio = true; priv->has_mdio = true;
} else if (priv->link_type == LINK_TYPE_RGMII_LINK_MAC_PHY) { } else if (priv->link_type == LINK_TYPE_RGMII_LINK_MAC_PHY) {
priv->phy_if = ofnode_read_phy_mode(offset_to_ofnode(slave)); priv->phy_if = ofnode_read_phy_mode(offset_to_ofnode(slave));
if (priv->phy_if == PHY_INTERFACE_MODE_NONE) if (priv->phy_if == PHY_INTERFACE_MODE_NA)
priv->phy_if = PHY_INTERFACE_MODE_RGMII; priv->phy_if = PHY_INTERFACE_MODE_RGMII;
pdata->phy_interface = priv->phy_if; pdata->phy_interface = priv->phy_if;

2
drivers/net/tsec.c
View file

@ -894,7 +894,7 @@ int tsec_probe(struct udevice *dev)
priv->tbiaddr = tbiaddr; priv->tbiaddr = tbiaddr;
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
pdata->phy_interface = tsec_get_interface(priv); pdata->phy_interface = tsec_get_interface(priv);
priv->interface = pdata->phy_interface; priv->interface = pdata->phy_interface;

2
drivers/net/xilinx_axi_emac.c
View file

@ -850,7 +850,7 @@ static int axi_emac_of_to_plat(struct udevice *dev)
} }
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
plat->eth_hasnobuf = fdtdec_get_bool(gd->fdt_blob, node, plat->eth_hasnobuf = fdtdec_get_bool(gd->fdt_blob, node,

2
drivers/net/zynq_gem.c
View file

@ -859,7 +859,7 @@ static int zynq_gem_of_to_plat(struct udevice *dev)
} }
pdata->phy_interface = dev_read_phy_mode(dev); pdata->phy_interface = dev_read_phy_mode(dev);
if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) if (pdata->phy_interface == PHY_INTERFACE_MODE_NA)
return -EINVAL; return -EINVAL;
priv->interface = pdata->phy_interface; priv->interface = pdata->phy_interface;

2
include/dm/ofnode.h
View file

@ -1239,7 +1239,7 @@ ofnode ofnode_get_phy_node(ofnode eth_node);
* returns the corresponding PHY interface type. * returns the corresponding PHY interface type.
* *
* @mac_node: ofnode containing the property * @mac_node: ofnode containing the property
* Return: one of PHY_INTERFACE_MODE_* constants, PHY_INTERFACE_MODE_NONE on * Return: one of PHY_INTERFACE_MODE_* constants, PHY_INTERFACE_MODE_NA on
* error * error
*/ */
phy_interface_t ofnode_read_phy_mode(ofnode mac_node); phy_interface_t ofnode_read_phy_mode(ofnode mac_node);

2
include/dm/read.h
View file

@ -764,7 +764,7 @@ ofnode dev_get_phy_node(const struct udevice *dev);
* returns the corresponding PHY interface type. * returns the corresponding PHY interface type.
* *
* @dev: device representing the MAC * @dev: device representing the MAC
* Return: one of PHY_INTERFACE_MODE_* constants, PHY_INTERFACE_MODE_NONE on * Return: one of PHY_INTERFACE_MODE_* constants, PHY_INTERFACE_MODE_NA on
* error * error
*/ */
phy_interface_t dev_read_phy_mode(const struct udevice *dev); phy_interface_t dev_read_phy_mode(const struct udevice *dev);

2
include/fm_eth.h
View file

@ -72,7 +72,7 @@ enum fm_eth_type {
#define FM_ETH_INFO_INITIALIZER(idx, pregs) \ #define FM_ETH_INFO_INITIALIZER(idx, pregs) \
.fm = idx, \ .fm = idx, \
.phy_regs = (void *)pregs, \ .phy_regs = (void *)pregs, \
.enet_if = PHY_INTERFACE_MODE_NONE, \ .enet_if = PHY_INTERFACE_MODE_NA, \
#ifdef CONFIG_SYS_FMAN_V3 #ifdef CONFIG_SYS_FMAN_V3
#define FM_DTSEC_INFO_INITIALIZER(idx, n) \ #define FM_DTSEC_INFO_INITIALIZER(idx, n) \

8
include/phy_interface.h
View file

@ -39,7 +39,7 @@ typedef enum {
PHY_INTERFACE_MODE_NCSI, PHY_INTERFACE_MODE_NCSI,
PHY_INTERFACE_MODE_10GBASER, PHY_INTERFACE_MODE_10GBASER,
PHY_INTERFACE_MODE_USXGMII, PHY_INTERFACE_MODE_USXGMII,
PHY_INTERFACE_MODE_NONE, /* Must be last */ PHY_INTERFACE_MODE_NA, /* Must be last */
PHY_INTERFACE_MODE_MAX, PHY_INTERFACE_MODE_MAX,
} phy_interface_t; } phy_interface_t;
@ -71,7 +71,7 @@ static const char * const phy_interface_strings[] = {
[PHY_INTERFACE_MODE_NCSI] = "NC-SI", [PHY_INTERFACE_MODE_NCSI] = "NC-SI",
[PHY_INTERFACE_MODE_10GBASER] = "10gbase-r", [PHY_INTERFACE_MODE_10GBASER] = "10gbase-r",
[PHY_INTERFACE_MODE_USXGMII] = "usxgmii", [PHY_INTERFACE_MODE_USXGMII] = "usxgmii",
[PHY_INTERFACE_MODE_NONE] = "", [PHY_INTERFACE_MODE_NA] = "",
}; };
/* Backplane modes: /* Backplane modes:
@ -86,8 +86,8 @@ static const char * const backplane_mode_strings[] = {
static inline const char *phy_string_for_interface(phy_interface_t i) static inline const char *phy_string_for_interface(phy_interface_t i)
{ {
/* Default to unknown */ /* Default to unknown */
if (i > PHY_INTERFACE_MODE_NONE) if (i > PHY_INTERFACE_MODE_NA)
i = PHY_INTERFACE_MODE_NONE; i = PHY_INTERFACE_MODE_NA;
return phy_interface_strings[i]; return phy_interface_strings[i];
} }

2
include/vsc9953.h
View file

@ -691,7 +691,7 @@ struct vsc9953_vcap {
.phyaddr = 0, \ .phyaddr = 0, \
.index = idx, \ .index = idx, \
.phy_regs = NULL, \ .phy_regs = NULL, \
.enet_if = PHY_INTERFACE_MODE_NONE, \ .enet_if = PHY_INTERFACE_MODE_NA, \
.bus = NULL, \ .bus = NULL, \
.phydev = NULL, \ .phydev = NULL, \
} }

4
net/mdio-uclass.c
View file

@ -199,8 +199,8 @@ struct phy_device *dm_eth_phy_connect(struct udevice *ethdev)
} }
interface = dev_read_phy_mode(ethdev); interface = dev_read_phy_mode(ethdev);
if (interface == PHY_INTERFACE_MODE_NONE) if (interface == PHY_INTERFACE_MODE_NA)
dev_dbg(ethdev, "can't find interface mode, default to NONE\n"); dev_dbg(ethdev, "can't find interface mode, default to NA\n");
phy = dm_eth_connect_phy_handle(ethdev, interface); phy = dm_eth_connect_phy_handle(ethdev, interface);