github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 03:53:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: phy: dp83822: Add support for phy_port representation

Browse Source 
With the phy_port representation introduced, we can use .attach_port to
populate the port information based on either the straps or the
ti,fiber-mode property. This allows simplifying the probe function and
allow users to override the strapping configuration.

Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Link: https://patch.msgid.link/20260108080041.553250-5-maxime.chevallier@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Maxime Chevallier 2026-01-08 09:00:29 +01:00 committed by Jakub Kicinski
parent 589e934d27
commit 333c29a27f
1 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
drivers/net/phy/dp83822.c
View File

@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/phy.h>
#include <linux/phy_port.h>
#include <linux/netdevice.h>
#include <linux/bitfield.h>
@ -811,17 +812,6 @@ static int dp83822_of_init(struct phy_device *phydev)
int i, ret;
u32 val;
/* Signal detection for the PHY is only enabled if the FX_EN and the
* SD_EN pins are strapped. Signal detection can only enabled if FX_EN
* is strapped otherwise signal detection is disabled for the PHY.
*/
if (dp83822->fx_enabled && dp83822->fx_sd_enable)
dp83822->fx_signal_det_low = device_property_present(dev,
"ti,link-loss-low");
if (!dp83822->fx_enabled)
dp83822->fx_enabled = device_property_present(dev,
"ti,fiber-mode");
if (!device_property_read_string(dev, "ti,gpio2-clk-out", &of_val)) {
if (strcmp(of_val, "mac-if") == 0) {
dp83822->gpio2_clk_out = DP83822_CLK_SRC_MAC_IF;
@ -950,6 +940,48 @@ static int dp83822_read_straps(struct phy_device *phydev)
return 0;
}
static int dp83822_attach_mdi_port(struct phy_device *phydev,
struct phy_port *port)
{
struct dp83822_private *dp83822 = phydev->priv;
int ret;
if (port->mediums) {
if (phy_port_is_fiber(port))
dp83822->fx_enabled = true;
} else {
ret = dp83822_read_straps(phydev);
if (ret)
return ret;
#if IS_ENABLED(CONFIG_OF_MDIO)
if (dp83822->fx_enabled && dp83822->fx_sd_enable)
dp83822->fx_signal_det_low =
device_property_present(&phydev->mdio.dev,
"ti,link-loss-low");
/* ti,fiber-mode is still used for backwards compatibility, but
* has been replaced with the mdi node definition, see
* ethernet-port.yaml
*/
if (!dp83822->fx_enabled)
dp83822->fx_enabled =
device_property_present(&phydev->mdio.dev,
"ti,fiber-mode");
#endif /* CONFIG_OF_MDIO */
if (dp83822->fx_enabled) {
port->mediums = BIT(ETHTOOL_LINK_MEDIUM_BASEF);
} else {
/* This PHY can only to 100BaseTX max, so on 2 pairs */
port->pairs = 2;
port->mediums = BIT(ETHTOOL_LINK_MEDIUM_BASET);
}
}
return 0;
}
static int dp8382x_probe(struct phy_device *phydev)
{
struct dp83822_private *dp83822;
@ -968,27 +1000,13 @@ static int dp8382x_probe(struct phy_device *phydev)
static int dp83822_probe(struct phy_device *phydev)
{
struct dp83822_private *dp83822;
int ret;
ret = dp8382x_probe(phydev);
if (ret)
return ret;
dp83822 = phydev->priv;
ret = dp83822_read_straps(phydev);
if (ret)
return ret;
ret = dp83822_of_init(phydev);
if (ret)
return ret;
if (dp83822->fx_enabled)
phydev->port = PORT_FIBRE;
return 0;
return dp83822_of_init(phydev);
}
static int dp83826_probe(struct phy_device *phydev)
@ -1172,6 +1190,7 @@ static int dp83822_led_hw_control_get(struct phy_device *phydev, u8 index,
.led_hw_is_supported = dp83822_led_hw_is_supported, \
.led_hw_control_set = dp83822_led_hw_control_set, \
.led_hw_control_get = dp83822_led_hw_control_get, \
.attach_mdi_port = dp83822_attach_mdi_port \
}
#define DP83825_PHY_DRIVER(_id, _name) \