layerscape: switch kernel to 6.1 version
[openwrt/staging/mans0n.git] / target / linux / layerscape / patches-5.15 / 702-phy-Add-2.5G-SGMII-interface-mode.patch
index 30fc56e618503cbd2188bdda11d1f23791453315..f1ce7cc0ad0fcc240c856b273c4a4083ab19add8 100644 (file)
@@ -11,9 +11,19 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
  include/linux/phy.h | 3 +++
  1 file changed, 3 insertions(+)
 
+--- a/drivers/net/phy/phy-core.c
++++ b/drivers/net/phy/phy-core.c
+@@ -136,6 +136,7 @@ int phy_interface_num_ports(phy_interfac
+       case PHY_INTERFACE_MODE_RXAUI:
+       case PHY_INTERFACE_MODE_XAUI:
+       case PHY_INTERFACE_MODE_1000BASEKX:
++      case PHY_INTERFACE_MODE_2500SGMII:
+               return 1;
+       case PHY_INTERFACE_MODE_QSGMII:
+       case PHY_INTERFACE_MODE_QUSGMII:
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -393,6 +393,7 @@ void phylink_get_linkmodes(unsigned long
+@@ -400,6 +400,7 @@ void phylink_get_linkmodes(unsigned long
                caps |= MAC_1000FD;
                break;
  
@@ -21,7 +31,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
        case PHY_INTERFACE_MODE_2500BASEX:
                caps |= MAC_2500FD;
                break;
-@@ -646,6 +647,10 @@ static int phylink_parse_mode(struct phy
+@@ -654,6 +655,10 @@ static int phylink_parse_mode(struct phy
                        phylink_set(pl->supported, 2500baseX_Full);
                        break;
  
@@ -34,18 +44,18 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
                        break;
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -153,6 +153,7 @@ typedef enum {
-       PHY_INTERFACE_MODE_USXGMII,
-       /* 10GBASE-KR - with Clause 73 AN */
+@@ -157,6 +157,7 @@ typedef enum {
        PHY_INTERFACE_MODE_10GKR,
+       PHY_INTERFACE_MODE_QUSGMII,
+       PHY_INTERFACE_MODE_1000BASEKX,
 +      PHY_INTERFACE_MODE_2500SGMII,
        PHY_INTERFACE_MODE_MAX,
  } phy_interface_t;
  
-@@ -268,6 +269,8 @@ static inline const char *phy_modes(phy_
-               return "10gbase-kr";
-       case PHY_INTERFACE_MODE_100BASEX:
+@@ -276,6 +277,8 @@ static inline const char *phy_modes(phy_
                return "100base-x";
+       case PHY_INTERFACE_MODE_QUSGMII:
+               return "qusgmii";
 +      case PHY_INTERFACE_MODE_2500SGMII:
 +              return "sgmii-2500";
        default: