From patchwork Wed Apr 6 22:33:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 1614169 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=OXvBbV1y; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KYfVK62H7z9sFs for ; Thu, 7 Apr 2022 08:35:37 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 08CE183E77; Thu, 7 Apr 2022 00:34:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="OXvBbV1y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 856C883E61; Thu, 7 Apr 2022 00:33:52 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D435E83E4F for ; Thu, 7 Apr 2022 00:33:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3A50AB82552; Wed, 6 Apr 2022 22:33:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FD80C385A6; Wed, 6 Apr 2022 22:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649284407; bh=VvPqyhhEOHi5xiX5/dhhiM/+wSCbcfsEgR8bSTZrklA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OXvBbV1yNoy8650676fCRzfDeYERZ/BpuHNIAV+nlpl3/ZmhtKhdgez2GjlnxKa/Z BygK9arUEWZWTD5KFxLzTSSeDIIRlXNiolNSVj9SM4Tux/MGFdSdKP2Os1C1VrixEh hVgiairnTDs3DYJRLcV+eflcAla8PIRNS5VoH4Zl5OmnUrkEah7FriFh+tXVRMkT79 CidCMokiEBkR3DuMO3vBbJe+DUEEwY/QCCweb8d8RFbF3kPwQK/SDAzNPfEU+EkPF0 F0dYjEihAJnGYI+Q1WC+P69iyzyA5M9XRrPvuuQYP87DWzP4jDwrJz46kDP8hdYGdh NSq/W2iEvdmXA== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Joe Hershberger , Ramon Fried Cc: u-boot@lists.denx.de, =?utf-8?q?Marek_Beh=C3=BAn?= , Stefan Roese , Vladimir Oltean Subject: [PATCH u-boot-net v4 09/14] treewide: Rename PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA Date: Thu, 7 Apr 2022 00:33:03 +0200 Message-Id: <20220406223308.9833-10-kabel@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220406223308.9833-1-kabel@kernel.org> References: <20220406223308.9833-1-kabel@kernel.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún Rename constant PHY_INTERFACE_MODE_NONE to PHY_INTERFACE_MODE_NA to make it compatible with Linux' naming. Signed-off-by: Marek Behún Reviewed-by: Stefan Roese Reviewed-by: Ramon Fried Reviewed-by: Vladimir Oltean --- board/freescale/corenet_ds/eth_hydra.c | 2 +- board/freescale/corenet_ds/eth_superhydra.c | 4 ++-- board/freescale/t104xrdb/eth.c | 4 ++-- drivers/core/ofnode.c | 4 ++-- drivers/net/ag7xxx.c | 2 +- drivers/net/altera_tse.c | 2 +- drivers/net/bcm6348-eth.c | 2 +- drivers/net/bcmgenet.c | 2 +- drivers/net/designware.c | 2 +- drivers/net/dwc_eth_qos.c | 4 ++-- drivers/net/fec_mxc.c | 2 +- drivers/net/fm/b4860.c | 8 ++++---- drivers/net/fm/init.c | 8 ++++---- drivers/net/fm/ls1043.c | 6 +++--- drivers/net/fm/ls1046.c | 8 ++++---- drivers/net/fm/p1023.c | 4 ++-- drivers/net/fm/p4080.c | 6 +++--- drivers/net/fm/p5020.c | 6 +++--- drivers/net/fm/p5040.c | 6 +++--- drivers/net/fm/t1024.c | 4 ++-- drivers/net/fm/t1040.c | 4 ++-- drivers/net/fm/t2080.c | 6 +++--- drivers/net/fm/t4240.c | 6 +++--- drivers/net/fsl_enetc.c | 2 +- drivers/net/ftgmac100.c | 2 +- drivers/net/higmacv300.c | 2 +- drivers/net/ldpaa_eth/ldpaa_eth.c | 2 +- drivers/net/ldpaa_eth/ldpaa_wriop.c | 10 +++++----- drivers/net/ldpaa_eth/ls1088a.c | 4 ++-- drivers/net/ldpaa_eth/ls2080a.c | 4 ++-- drivers/net/ldpaa_eth/lx2160a.c | 4 ++-- drivers/net/macb.c | 2 +- drivers/net/mscc_eswitch/jr2_switch.c | 2 +- drivers/net/mscc_eswitch/luton_switch.c | 2 +- drivers/net/mscc_eswitch/ocelot_switch.c | 2 +- drivers/net/mscc_eswitch/serval_switch.c | 2 +- drivers/net/mscc_eswitch/servalt_switch.c | 2 +- drivers/net/mt7620-eth.c | 12 ++++++------ drivers/net/mtk_eth.c | 2 +- drivers/net/mvgbe.c | 2 +- drivers/net/mvneta.c | 2 +- drivers/net/mvpp2.c | 2 +- drivers/net/pic32_eth.c | 2 +- drivers/net/qe/dm_qe_uec.c | 2 +- drivers/net/ravb.c | 2 +- drivers/net/sh_eth.c | 2 +- drivers/net/sni_ave.c | 2 +- drivers/net/sni_netsec.c | 2 +- drivers/net/sun8i_emac.c | 2 +- drivers/net/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ti/cpsw.c | 2 +- drivers/net/ti/keystone_net.c | 2 +- drivers/net/tsec.c | 2 +- drivers/net/xilinx_axi_emac.c | 2 +- drivers/net/zynq_gem.c | 2 +- include/dm/ofnode.h | 2 +- include/dm/read.h | 2 +- include/fm_eth.h | 2 +- include/phy_interface.h | 8 ++++---- include/vsc9953.h | 2 +- net/mdio-uclass.c | 4 ++-- 61 files changed, 105 insertions(+), 105 deletions(-) diff --git a/board/freescale/corenet_ds/eth_hydra.c b/board/freescale/corenet_ds/eth_hydra.c index 6500c2fcf6..a27e905ace 100644 --- a/board/freescale/corenet_ds/eth_hydra.c +++ b/board/freescale/corenet_ds/eth_hydra.c @@ -471,7 +471,7 @@ int board_eth_init(struct bd_info *bis) fm_info_set_mdio(i, miiphy_get_dev_by_name("HYDRA_RGMII_MDIO")); break; - case PHY_INTERFACE_MODE_NONE: + case PHY_INTERFACE_MODE_NA: fm_info_set_phy_address(i, 0); break; default: diff --git a/board/freescale/corenet_ds/eth_superhydra.c b/board/freescale/corenet_ds/eth_superhydra.c index de7b692f3f..55bac0f761 100644 --- a/board/freescale/corenet_ds/eth_superhydra.c +++ b/board/freescale/corenet_ds/eth_superhydra.c @@ -583,7 +583,7 @@ int board_eth_init(struct bd_info *bis) fm_info_set_mdio(i, miiphy_get_dev_by_name("SUPER_HYDRA_RGMII_MDIO")); break; - case PHY_INTERFACE_MODE_NONE: + case PHY_INTERFACE_MODE_NA: fm_info_set_phy_address(i, 0); break; default: @@ -733,7 +733,7 @@ int board_eth_init(struct bd_info *bis) fm_info_set_mdio(i, miiphy_get_dev_by_name("SUPER_HYDRA_RGMII_MDIO")); break; - case PHY_INTERFACE_MODE_NONE: + case PHY_INTERFACE_MODE_NA: fm_info_set_phy_address(i, 0); break; default: diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c index b034f11d68..3ae5d722aa 100644 --- a/board/freescale/t104xrdb/eth.c +++ b/board/freescale/t104xrdb/eth.c @@ -89,7 +89,7 @@ int board_eth_init(struct bd_info *bis) case PHY_INTERFACE_MODE_QSGMII: fm_info_set_phy_address(i, 0); break; - case PHY_INTERFACE_MODE_NONE: + case PHY_INTERFACE_MODE_NA: fm_info_set_phy_address(i, 0); break; default: @@ -99,7 +99,7 @@ int board_eth_init(struct bd_info *bis) break; } 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); else fm_info_set_mdio(i, diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index d9ccb1bad2..a59832ebbf 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -1232,7 +1232,7 @@ phy_interface_t ofnode_read_phy_mode(ofnode node) mode = ofnode_read_string(node, "phy-connection-type"); if (!mode) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; for (i = 0; i < PHY_INTERFACE_MODE_MAX; 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); - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/ag7xxx.c b/drivers/net/ag7xxx.c index f24a917bd4..a16c998b2a 100644 --- a/drivers/net/ag7xxx.c +++ b/drivers/net/ag7xxx.c @@ -1265,7 +1265,7 @@ static int ag7xxx_eth_of_to_plat(struct udevice *dev) return ret; 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 0; diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index 25247472b0..b1e5c5890a 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -678,7 +678,7 @@ static int altera_tse_of_to_plat(struct udevice *dev) struct eth_pdata *pdata = dev_get_plat(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 0; diff --git a/drivers/net/bcm6348-eth.c b/drivers/net/bcm6348-eth.c index 8f1864a334..5317173611 100644 --- a/drivers/net/bcm6348-eth.c +++ b/drivers/net/bcm6348-eth.c @@ -425,7 +425,7 @@ static int bcm6348_eth_probe(struct udevice *dev) /* get phy mode */ 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; /* get phy */ diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c index c6acb4932b..ef321f2839 100644 --- a/drivers/net/bcmgenet.c +++ b/drivers/net/bcmgenet.c @@ -696,7 +696,7 @@ static int bcmgenet_eth_of_to_plat(struct udevice *dev) /* Get phy mode from DT */ 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; ret = dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 7b7b0f6578..1584b9eac1 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -921,7 +921,7 @@ int designware_eth_of_to_plat(struct udevice *dev) pdata->iobase = dev_read_addr(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; pdata->max_speed = dev_read_u32_default(dev, "max-speed", 0); diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c index 9777f6cb9c..39aedc80f4 100644 --- a/drivers/net/dwc_eth_qos.c +++ b/drivers/net/dwc_eth_qos.c @@ -1682,7 +1682,7 @@ static int eqos_probe_resources_stm32(struct udevice *dev) interface = eqos->config->interface(dev); - if (interface == PHY_INTERFACE_MODE_NONE) { + if (interface == PHY_INTERFACE_MODE_NA) { pr_err("Invalid PHY interface\n"); return -EINVAL; } @@ -1743,7 +1743,7 @@ static int eqos_probe_resources_imx(struct udevice *dev) interface = eqos->config->interface(dev); - if (interface == PHY_INTERFACE_MODE_NONE) { + if (interface == PHY_INTERFACE_MODE_NA) { pr_err("Invalid PHY interface\n"); return -EINVAL; } diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 22c2a3a30f..3ac8e2a9cd 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1315,7 +1315,7 @@ static int fecmxc_of_to_plat(struct udevice *dev) priv->eth = (struct ethernet_regs *)pdata->iobase; 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; #ifdef CONFIG_DM_REGULATOR diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c index 6e3d008199..e622d86ba3 100644 --- a/drivers/net/fm/b4860.c +++ b/drivers/net/fm/b4860.c @@ -55,7 +55,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) #endif if (is_device_disabled(port)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; /*B4860 has two 10Gig Mac*/ 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_DTSEC3) || (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; break; default: - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index 2fed64205c..af94dabe29 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -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 - * 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 */ void fman_enet_init(void) @@ -141,7 +141,7 @@ void fman_enet_init(void) phy_interface_t enet_if; 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].enet_if = enet_if; } else { @@ -221,12 +221,12 @@ phy_interface_t fm_info_get_enet_if(enum fm_port port) int i = fm_port_to_index(port); if (i == -1) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if (fm_info[i].enabled) return fm_info[i].enet_if; - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } static void diff --git a/drivers/net/fm/ls1043.c b/drivers/net/fm/ls1043.c index e1abf8f6bb..cd8376a615 100644 --- a/drivers/net/fm/ls1043.c +++ b/drivers/net/fm/ls1043.c @@ -54,13 +54,13 @@ phy_interface_t fman_port_enet_if(enum fm_port port) u32 rcwsr13 = in_be32(&gur->rcwsr[13]); 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))) return PHY_INTERFACE_MODE_XGMII; 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 ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) == @@ -107,5 +107,5 @@ phy_interface_t fman_port_enet_if(enum fm_port port) break; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fm/ls1046.c b/drivers/net/fm/ls1046.c index 09df0aa537..876f48b147 100644 --- a/drivers/net/fm/ls1046.c +++ b/drivers/net/fm/ls1046.c @@ -54,19 +54,19 @@ phy_interface_t fman_port_enet_if(enum fm_port port) u32 rcwsr13 = in_be32(&gur->rcwsr[13]); 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))) return PHY_INTERFACE_MODE_XGMII; 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))) return PHY_INTERFACE_MODE_XGMII; 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 ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) == @@ -118,5 +118,5 @@ phy_interface_t fman_port_enet_if(enum fm_port port) break; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fm/p1023.c b/drivers/net/fm/p1023.c index d4167e4d69..c9b85fc8a8 100644 --- a/drivers/net/fm/p1023.c +++ b/drivers/net/fm/p1023.c @@ -46,7 +46,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) u32 pordevsr = in_be32(&gur->pordevsr); if (is_device_disabled(port)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; /* DTSEC1 can be SGMII, RGMII or RMII */ 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_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fm/p4080.c b/drivers/net/fm/p4080.c index b78b02d828..577ee22cb0 100644 --- a/drivers/net/fm/p4080.c +++ b/drivers/net/fm/p4080.c @@ -54,7 +54,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) u32 rcwsr11 = in_be32(&gur->rcwsr[11]); if (is_device_disabled(port)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if ((port == FM1_10GEC1) && (is_serdes_configured(XAUI_FM1))) 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; break; default: - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fm/p5020.c b/drivers/net/fm/p5020.c index 8189531215..8ecc48276a 100644 --- a/drivers/net/fm/p5020.c +++ b/drivers/net/fm/p5020.c @@ -50,7 +50,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) u32 rcwsr11 = in_be32(&gur->rcwsr[11]); if (is_device_disabled(port)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if ((port == FM1_10GEC1) && (is_serdes_configured(XAUI_FM1))) 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; break; default: - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fm/p5040.c b/drivers/net/fm/p5040.c index 38744e7b7b..3a1494d131 100644 --- a/drivers/net/fm/p5040.c +++ b/drivers/net/fm/p5040.c @@ -56,7 +56,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) u32 rcwsr11 = in_be32(&gur->rcwsr[11]); if (is_device_disabled(port)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if ((port == FM1_10GEC1) && (is_serdes_configured(XAUI_FM1))) 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; break; default: - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fm/t1024.c b/drivers/net/fm/t1024.c index 696e74c9e6..7110fb4fb1 100644 --- a/drivers/net/fm/t1024.c +++ b/drivers/net/fm/t1024.c @@ -39,7 +39,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) u32 rcwsr13 = in_be32(&gur->rcwsr[13]); 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))) return PHY_INTERFACE_MODE_XGMII; @@ -83,5 +83,5 @@ phy_interface_t fman_port_enet_if(enum fm_port port) break; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fm/t1040.c b/drivers/net/fm/t1040.c index af4f5c5610..192f1c6c81 100644 --- a/drivers/net/fm/t1040.c +++ b/drivers/net/fm/t1040.c @@ -56,8 +56,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port) return PHY_INTERFACE_MODE_SGMII; break; default: - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fm/t2080.c b/drivers/net/fm/t2080.c index f4d8d2d869..bfbd8de9cf 100644 --- a/drivers/net/fm/t2080.c +++ b/drivers/net/fm/t2080.c @@ -47,7 +47,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) u32 rcwsr13 = in_be32(&gur->rcwsr[13]); if (is_device_disabled(port)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if ((port == FM1_10GEC1 || port == FM1_10GEC2) && ((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; break; default: - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fm/t4240.c b/drivers/net/fm/t4240.c index f8e63c3d71..ba7b86282f 100644 --- a/drivers/net/fm/t4240.c +++ b/drivers/net/fm/t4240.c @@ -61,7 +61,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) u32 rcwsr13 = in_be32(&gur->rcwsr[13]); if (is_device_disabled(port)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if ((port == FM1_10GEC1 || port == FM1_10GEC2) && ((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) && ((is_serdes_configured(XFI_FM1_MAC9)) || (is_serdes_configured(XFI_FM1_MAC10)))) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if ((port == FM2_10GEC1 || port == FM2_10GEC2) && ((is_serdes_configured(XAUI_FM2_MAC9)) || @@ -166,5 +166,5 @@ phy_interface_t fman_port_enet_if(enum fm_port port) break; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fsl_enetc.c b/drivers/net/fsl_enetc.c index 8f5af1dbc0..1724f948bc 100644 --- a/drivers/net/fsl_enetc.c +++ b/drivers/net/fsl_enetc.c @@ -277,7 +277,7 @@ static void enetc_start_pcs(struct udevice *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, "phy-mode property not found, defaulting to SGMII\n"); priv->if_type = PHY_INTERFACE_MODE_SGMII; diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 626c27d7bf..78779d7d60 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -553,7 +553,7 @@ static int ftgmac100_of_to_plat(struct udevice *dev) pdata->iobase = dev_read_addr(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; pdata->max_speed = dev_read_u32_default(dev, "max-speed", 0); diff --git a/drivers/net/higmacv300.c b/drivers/net/higmacv300.c index ce8f2dfd09..1862235d0c 100644 --- a/drivers/net/higmacv300.c +++ b/drivers/net/higmacv300.c @@ -567,7 +567,7 @@ static int higmac_of_to_plat(struct udevice *dev) priv->macif_ctrl = dev_remap_addr_index(dev, 1); priv->phyintf = dev_read_phy_mode(dev); - if (priv->phyintf == PHY_INTERFACE_MODE_NONE) + if (priv->phyintf == PHY_INTERFACE_MODE_NA) return -ENODEV; phy_node = dev_read_subnode(dev, "phy"); diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index c775598b91..b6f589eb91 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -1127,7 +1127,7 @@ static int ldpaa_eth_bind(struct udevice *dev) int phy_mode = -1; 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"); return -EINVAL; } diff --git a/drivers/net/ldpaa_eth/ldpaa_wriop.c b/drivers/net/ldpaa_eth/ldpaa_wriop.c index 06a284ad68..adecb81357 100644 --- a/drivers/net/ldpaa_eth/ldpaa_wriop.c +++ b/drivers/net/ldpaa_eth/ldpaa_wriop.c @@ -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) { - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } 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].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); - if (enet_if != PHY_INTERFACE_MODE_NONE) { + if (enet_if != PHY_INTERFACE_MODE_NA) { dpmac_info[dpmac_id].enabled = 1; dpmac_info[dpmac_id].id = dpmac_id; 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); if (i == -1) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if (dpmac_info[i].enabled) return dpmac_info[i].enet_if; - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c index 54cb16e51b..943113b20a 100644 --- a/drivers/net/ldpaa_eth/ls1088a.c +++ b/drivers/net/ldpaa_eth/ls1088a.c @@ -50,7 +50,7 @@ phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl) enum srds_prtcl; if (is_device_disabled(dpmac_id + 1)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; switch (lane_prtcl) { 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) 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) diff --git a/drivers/net/ldpaa_eth/ls2080a.c b/drivers/net/ldpaa_eth/ls2080a.c index 49eee044f3..62e1d6b869 100644 --- a/drivers/net/ldpaa_eth/ls2080a.c +++ b/drivers/net/ldpaa_eth/ls2080a.c @@ -62,7 +62,7 @@ phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl) enum srds_prtcl; if (is_device_disabled(dpmac_id + 1)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if (lane_prtcl >= SGMII1 && lane_prtcl <= SGMII16) 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) 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) diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c index e57f1a19a5..f0f8ee1d4d 100644 --- a/drivers/net/ldpaa_eth/lx2160a.c +++ b/drivers/net/ldpaa_eth/lx2160a.c @@ -58,7 +58,7 @@ phy_interface_t wriop_dpmac_enet_if(int dpmac_id, int lane_prtcl) enum srds_prtcl; if (is_device_disabled(dpmac_id)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if (lane_prtcl >= SGMII1 && lane_prtcl <= SGMII18) 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) return PHY_INTERFACE_MODE_CAUI4; - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } #ifdef CONFIG_SYS_FSL_HAS_RGMII diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 317b380e8f..e02a57b411 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1363,7 +1363,7 @@ static int macb_eth_probe(struct udevice *dev) int ret; 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; /* Read phyaddr from DT */ diff --git a/drivers/net/mscc_eswitch/jr2_switch.c b/drivers/net/mscc_eswitch/jr2_switch.c index d1e5b61ea5..1462b8f3bc 100644 --- a/drivers/net/mscc_eswitch/jr2_switch.c +++ b/drivers/net/mscc_eswitch/jr2_switch.c @@ -954,7 +954,7 @@ static int jr2_probe(struct udevice *dev) phy = phy_connect(priv->ports[i].bus, priv->ports[i].phy_addr, dev, - PHY_INTERFACE_MODE_NONE); + PHY_INTERFACE_MODE_NA); if (phy) board_phy_config(phy); } diff --git a/drivers/net/mscc_eswitch/luton_switch.c b/drivers/net/mscc_eswitch/luton_switch.c index 73c950d118..5e4f00c4f4 100644 --- a/drivers/net/mscc_eswitch/luton_switch.c +++ b/drivers/net/mscc_eswitch/luton_switch.c @@ -685,7 +685,7 @@ static int luton_probe(struct udevice *dev) phy = phy_connect(priv->ports[i].bus, priv->ports[i].phy_addr, dev, - PHY_INTERFACE_MODE_NONE); + PHY_INTERFACE_MODE_NA); if (phy && i >= MAX_INT_PORT) board_phy_config(phy); } diff --git a/drivers/net/mscc_eswitch/ocelot_switch.c b/drivers/net/mscc_eswitch/ocelot_switch.c index d1d0a489ab..1bf6c42c0f 100644 --- a/drivers/net/mscc_eswitch/ocelot_switch.c +++ b/drivers/net/mscc_eswitch/ocelot_switch.c @@ -608,7 +608,7 @@ static int ocelot_probe(struct udevice *dev) phy = phy_connect(priv->ports[i].bus, priv->ports[i].phy_addr, dev, - PHY_INTERFACE_MODE_NONE); + PHY_INTERFACE_MODE_NA); if (phy && external_bus(priv, i)) board_phy_config(phy); } diff --git a/drivers/net/mscc_eswitch/serval_switch.c b/drivers/net/mscc_eswitch/serval_switch.c index c4b81f7529..38ddba12b6 100644 --- a/drivers/net/mscc_eswitch/serval_switch.c +++ b/drivers/net/mscc_eswitch/serval_switch.c @@ -561,7 +561,7 @@ static int serval_probe(struct udevice *dev) phy = phy_connect(priv->ports[i].bus, priv->ports[i].phy_addr, dev, - PHY_INTERFACE_MODE_NONE); + PHY_INTERFACE_MODE_NA); if (phy) board_phy_config(phy); } diff --git a/drivers/net/mscc_eswitch/servalt_switch.c b/drivers/net/mscc_eswitch/servalt_switch.c index f114086ece..db863c2a9f 100644 --- a/drivers/net/mscc_eswitch/servalt_switch.c +++ b/drivers/net/mscc_eswitch/servalt_switch.c @@ -482,7 +482,7 @@ static int servalt_probe(struct udevice *dev) continue; phy_connect(priv->ports[i].bus, priv->ports[i].phy_addr, dev, - PHY_INTERFACE_MODE_NONE); + PHY_INTERFACE_MODE_NA); } return 0; diff --git a/drivers/net/mt7620-eth.c b/drivers/net/mt7620-eth.c index 24fcb9373f..038cba1240 100644 --- a/drivers/net/mt7620-eth.c +++ b/drivers/net/mt7620-eth.c @@ -596,7 +596,7 @@ static int mt7620_setup_gmac_mode(struct mt7620_eth_priv *priv, u32 gmac, case PHY_INTERFACE_MODE_RGMII: ge_mode = MT7620_SYSC_GE_RGMII; break; - case PHY_INTERFACE_MODE_NONE: + case PHY_INTERFACE_MODE_NA: if (gmac == 2) ge_mode = MT7620_SYSC_GE_ESW_PHY; else @@ -620,7 +620,7 @@ static void mt7620_gsw_setup_port(struct mt7620_eth_priv *priv, u32 port, { u32 pmcr; - if (port_cfg->mode == PHY_INTERFACE_MODE_NONE) { + if (port_cfg->mode == PHY_INTERFACE_MODE_NA) { if (port == 5) { gsw_write(priv, GSW_PMCR(port), FORCE_MODE); return; @@ -666,7 +666,7 @@ static void mt7620_gsw_setup_phy_polling(struct mt7620_eth_priv *priv) { 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; else 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_RMII: case PHY_INTERFACE_MODE_RGMII: - case PHY_INTERFACE_MODE_NONE: + case PHY_INTERFACE_MODE_NA: break; default: 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) return ret; } 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"); if (ofnode_valid(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; } diff --git a/drivers/net/mtk_eth.c b/drivers/net/mtk_eth.c index d6065db5fb..666ddeb10d 100644 --- a/drivers/net/mtk_eth.c +++ b/drivers/net/mtk_eth.c @@ -1449,7 +1449,7 @@ static int mtk_eth_of_to_plat(struct udevice *dev) /* Interface mode is required */ pdata->phy_interface = dev_read_phy_mode(dev); 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"); return -EINVAL; } diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index 32ec0b437d..bf5ed5513b 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -1005,7 +1005,7 @@ static int mvgbe_of_to_plat(struct udevice *dev) /* Get phy-mode / phy_interface from DT */ 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; dmvgbe->phy_interface = pdata->phy_interface; diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index d31b96a9d8..e2ac4d801d 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -1804,7 +1804,7 @@ static int mvneta_of_to_plat(struct udevice *dev) /* Get phy-mode / phy_interface from DT */ 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 0; diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index dfddac180f..8c9afdf79a 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -4820,7 +4820,7 @@ static int phy_info_parse(struct udevice *dev, struct mvpp2_port *port) } 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"); return -EINVAL; } diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c index 03eb51e51d..1333a3aa7e 100644 --- a/drivers/net/pic32_eth.c +++ b/drivers/net/pic32_eth.c @@ -550,7 +550,7 @@ static int pic32_eth_probe(struct udevice *dev) /* get phy mode */ 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; /* get phy addr */ diff --git a/drivers/net/qe/dm_qe_uec.c b/drivers/net/qe/dm_qe_uec.c index 5a66d726cd..8fec1c21e1 100644 --- a/drivers/net/qe/dm_qe_uec.c +++ b/drivers/net/qe/dm_qe_uec.c @@ -1137,7 +1137,7 @@ static int qe_uec_of_to_plat(struct udevice *dev) pdata->iobase = (phys_addr_t)devfdt_get_addr(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 0; diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index f6d386bd6b..5c152d6e0a 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -679,7 +679,7 @@ int ravb_of_to_plat(struct udevice *dev) pdata->iobase = dev_read_addr(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; pdata->max_speed = 1000; diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 04c9c2d968..5c57e3dfcd 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -920,7 +920,7 @@ int sh_ether_of_to_plat(struct udevice *dev) pdata->iobase = dev_read_addr(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; pdata->max_speed = 1000; diff --git a/drivers/net/sni_ave.c b/drivers/net/sni_ave.c index 0a368c6d03..d684e60e72 100644 --- a/drivers/net/sni_ave.c +++ b/drivers/net/sni_ave.c @@ -749,7 +749,7 @@ static int ave_of_to_plat(struct udevice *dev) pdata->iobase = dev_read_addr(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; pdata->max_speed = 0; diff --git a/drivers/net/sni_netsec.c b/drivers/net/sni_netsec.c index 693fd3a35d..24caacf847 100644 --- a/drivers/net/sni_netsec.c +++ b/drivers/net/sni_netsec.c @@ -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; 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; if (!dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 5654a3430e..5943a5e3f0 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -947,7 +947,7 @@ static int sun8i_emac_eth_of_to_plat(struct udevice *dev) pdata->phy_interface = dev_read_phy_mode(dev); 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; if (priv->variant == H3_EMAC) { diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index c1da334739..9580fa37ea 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -607,7 +607,7 @@ static int am65_cpsw_ofdata_parse_phy(struct udevice *dev) dev_read_u32(dev, "reg", &priv->port_id); 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); return -EINVAL; } diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 5b7bab734e..8988c21e66 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -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; - if (pdata->phy_interface == PHY_INTERFACE_MODE_NONE) + if (pdata->phy_interface == PHY_INTERFACE_MODE_NA) return -EINVAL; return 0; diff --git a/drivers/net/ti/keystone_net.c b/drivers/net/ti/keystone_net.c index b55e7da4c1..16e3f32bb0 100644 --- a/drivers/net/ti/keystone_net.c +++ b/drivers/net/ti/keystone_net.c @@ -728,7 +728,7 @@ static int ks2_eth_parse_slave_interface(int netcp, int slave, priv->has_mdio = true; } else if (priv->link_type == LINK_TYPE_RGMII_LINK_MAC_PHY) { 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; pdata->phy_interface = priv->phy_if; diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index fec051ebb7..d69a9ff477 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -894,7 +894,7 @@ int tsec_probe(struct udevice *dev) priv->tbiaddr = tbiaddr; 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); priv->interface = pdata->phy_interface; diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 02d13c3e0a..a4715735c3 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -850,7 +850,7 @@ static int axi_emac_of_to_plat(struct udevice *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; plat->eth_hasnobuf = fdtdec_get_bool(gd->fdt_blob, node, diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 0062851134..cf6c53c8af 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -859,7 +859,7 @@ static int zynq_gem_of_to_plat(struct udevice *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; priv->interface = pdata->phy_interface; diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 3bd3ba4925..f27aca5877 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -1239,7 +1239,7 @@ ofnode ofnode_get_phy_node(ofnode eth_node); * returns the corresponding PHY interface type. * * @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 */ phy_interface_t ofnode_read_phy_mode(ofnode mac_node); diff --git a/include/dm/read.h b/include/dm/read.h index bfa2645967..1b54b69acf 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -764,7 +764,7 @@ ofnode dev_get_phy_node(const struct udevice *dev); * returns the corresponding PHY interface type. * * @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 */ phy_interface_t dev_read_phy_mode(const struct udevice *dev); diff --git a/include/fm_eth.h b/include/fm_eth.h index 44da014c66..bf9570679d 100644 --- a/include/fm_eth.h +++ b/include/fm_eth.h @@ -72,7 +72,7 @@ enum fm_eth_type { #define FM_ETH_INFO_INITIALIZER(idx, pregs) \ .fm = idx, \ .phy_regs = (void *)pregs, \ - .enet_if = PHY_INTERFACE_MODE_NONE, \ + .enet_if = PHY_INTERFACE_MODE_NA, \ #ifdef CONFIG_SYS_FMAN_V3 #define FM_DTSEC_INFO_INITIALIZER(idx, n) \ diff --git a/include/phy_interface.h b/include/phy_interface.h index 494bc87e67..59e119a639 100644 --- a/include/phy_interface.h +++ b/include/phy_interface.h @@ -39,7 +39,7 @@ typedef enum { PHY_INTERFACE_MODE_NCSI, PHY_INTERFACE_MODE_10GBASER, PHY_INTERFACE_MODE_USXGMII, - PHY_INTERFACE_MODE_NONE, /* Must be last */ + PHY_INTERFACE_MODE_NA, /* Must be last */ PHY_INTERFACE_MODE_MAX, } phy_interface_t; @@ -71,7 +71,7 @@ static const char * const phy_interface_strings[] = { [PHY_INTERFACE_MODE_NCSI] = "NC-SI", [PHY_INTERFACE_MODE_10GBASER] = "10gbase-r", [PHY_INTERFACE_MODE_USXGMII] = "usxgmii", - [PHY_INTERFACE_MODE_NONE] = "", + [PHY_INTERFACE_MODE_NA] = "", }; /* 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) { /* Default to unknown */ - if (i > PHY_INTERFACE_MODE_NONE) - i = PHY_INTERFACE_MODE_NONE; + if (i > PHY_INTERFACE_MODE_NA) + i = PHY_INTERFACE_MODE_NA; return phy_interface_strings[i]; } diff --git a/include/vsc9953.h b/include/vsc9953.h index a9c84b4b50..fd52c93044 100644 --- a/include/vsc9953.h +++ b/include/vsc9953.h @@ -691,7 +691,7 @@ struct vsc9953_vcap { .phyaddr = 0, \ .index = idx, \ .phy_regs = NULL, \ - .enet_if = PHY_INTERFACE_MODE_NONE, \ + .enet_if = PHY_INTERFACE_MODE_NA, \ .bus = NULL, \ .phydev = NULL, \ } diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index 874f59413a..7593618d9a 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -199,8 +199,8 @@ struct phy_device *dm_eth_phy_connect(struct udevice *ethdev) } interface = dev_read_phy_mode(ethdev); - if (interface == PHY_INTERFACE_MODE_NONE) - dev_dbg(ethdev, "can't find interface mode, default to NONE\n"); + if (interface == PHY_INTERFACE_MODE_NA) + dev_dbg(ethdev, "can't find interface mode, default to NA\n"); phy = dm_eth_connect_phy_handle(ethdev, interface);