Commit fa83820e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-phy-XLGMII-define-and-usage-in-PHYLINK' 



Jose Abreu says:

====================
net: phy: XLGMII define and usage in PHYLINK

Adds XLGMII defines and usage in PHYLINK.

Patch 1/2, adds the define for it, whilst 2/2 adds the usage of it in
PHYLINK.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f1dc7460 1671c42d

drivers/net/phy/phylink.c

+27 −0
Original line number Diff line number Diff line
@@ -326,6 +326,33 @@ static int phylink_parse_mode(struct phylink *pl, struct fwnode_handle *fwnode) 
			phylink_set(pl->supported, 10000baseER_Full);

			break;



		case PHY_INTERFACE_MODE_XLGMII:

			phylink_set(pl->supported, 25000baseCR_Full);

			phylink_set(pl->supported, 25000baseKR_Full);

			phylink_set(pl->supported, 25000baseSR_Full);

			phylink_set(pl->supported, 40000baseKR4_Full);

			phylink_set(pl->supported, 40000baseCR4_Full);

			phylink_set(pl->supported, 40000baseSR4_Full);

			phylink_set(pl->supported, 40000baseLR4_Full);

			phylink_set(pl->supported, 50000baseCR2_Full);

			phylink_set(pl->supported, 50000baseKR2_Full);

			phylink_set(pl->supported, 50000baseSR2_Full);

			phylink_set(pl->supported, 50000baseKR_Full);

			phylink_set(pl->supported, 50000baseSR_Full);

			phylink_set(pl->supported, 50000baseCR_Full);

			phylink_set(pl->supported, 50000baseLR_ER_FR_Full);

			phylink_set(pl->supported, 50000baseDR_Full);

			phylink_set(pl->supported, 100000baseKR4_Full);

			phylink_set(pl->supported, 100000baseSR4_Full);

			phylink_set(pl->supported, 100000baseCR4_Full);

			phylink_set(pl->supported, 100000baseLR4_ER4_Full);

			phylink_set(pl->supported, 100000baseKR2_Full);

			phylink_set(pl->supported, 100000baseSR2_Full);

			phylink_set(pl->supported, 100000baseCR2_Full);

			phylink_set(pl->supported, 100000baseLR2_ER2_FR2_Full);

			phylink_set(pl->supported, 100000baseDR2_Full);

			break;



		default:

			phylink_err(pl,

				    "incorrect link mode %s for in-band status\n",

include/linux/phy.h

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ typedef enum { 
	PHY_INTERFACE_MODE_RTBI,

	PHY_INTERFACE_MODE_SMII,

	PHY_INTERFACE_MODE_XGMII,

	PHY_INTERFACE_MODE_XLGMII,

	PHY_INTERFACE_MODE_MOCA,

	PHY_INTERFACE_MODE_QSGMII,

	PHY_INTERFACE_MODE_TRGMII,
@@ -165,6 +166,8 @@ static inline const char *phy_modes(phy_interface_t interface) 
		return "smii";

	case PHY_INTERFACE_MODE_XGMII:

		return "xgmii";

	case PHY_INTERFACE_MODE_XLGMII:

		return "xlgmii";

	case PHY_INTERFACE_MODE_MOCA:

		return "moca";

	case PHY_INTERFACE_MODE_QSGMII:

CRA Git | Maintained and supported by SUSTech CRA and CCSE