| Message ID | 20230322084247.29149-1-stefan.herbrechtsmeier-oss@weidmueller.com |
|---|---|
| State | Accepted |
| Commit | 29003429617945250e2cafed985f8221d4b46832 |
| Delegated to: | Ramon Fried |
| Headers | show |
| Series | [v2] net: phy: gmii2rgmii: Support external rgmii-id phy | expand |
On 3/22/23 09:42, Stefan Herbrechtsmeier wrote: > From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> > > Read the phy mode of the external phy from the device tree if available > and check that it is a RGMII variant. > > Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> > > --- > > Changes in v2: > - Check that the external phy mode is a RGMII variant > > drivers/net/phy/xilinx_gmii2rgmii.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c > index 7376283956..853a0df659 100644 > --- a/drivers/net/phy/xilinx_gmii2rgmii.c > +++ b/drivers/net/phy/xilinx_gmii2rgmii.c > @@ -48,7 +48,14 @@ static int xilinxgmiitorgmii_config(struct phy_device *phydev) > return -EINVAL; > } > > - ext_phydev->interface = PHY_INTERFACE_MODE_RGMII; > + ext_phydev->interface = ofnode_read_phy_mode(node); > + if (ext_phydev->interface == PHY_INTERFACE_MODE_NA) { > + ext_phydev->interface = PHY_INTERFACE_MODE_RGMII; > + } else if (!phy_interface_is_rgmii(ext_phydev)) { > + printf("Incorrect external interface type\n"); > + return -EINVAL; > + } > + > ext_phydev->node = phandle.node; > phydev->priv = ext_phydev; > Applied. M
On Wed, Mar 22, 2023 at 09:42:47AM +0100, Stefan Herbrechtsmeier wrote: > From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> > > Read the phy mode of the external phy from the device tree if available > and check that it is a RGMII variant. > > Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Applied to u-boot/master, thanks!
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c index 7376283956..853a0df659 100644 --- a/drivers/net/phy/xilinx_gmii2rgmii.c +++ b/drivers/net/phy/xilinx_gmii2rgmii.c @@ -48,7 +48,14 @@ static int xilinxgmiitorgmii_config(struct phy_device *phydev) return -EINVAL; } - ext_phydev->interface = PHY_INTERFACE_MODE_RGMII; + ext_phydev->interface = ofnode_read_phy_mode(node); + if (ext_phydev->interface == PHY_INTERFACE_MODE_NA) { + ext_phydev->interface = PHY_INTERFACE_MODE_RGMII; + } else if (!phy_interface_is_rgmii(ext_phydev)) { + printf("Incorrect external interface type\n"); + return -EINVAL; + } + ext_phydev->node = phandle.node; phydev->priv = ext_phydev;