kernel: 5.15: backport v6.1 PHY changes required for Aquantia

[openwrt/staging/dangole.git] / target / linux / layerscape / patches-5.15 / 702-phy-Add-2.5G-SGMII-interface-mode.patch

diff --git a/target/linux/layerscape/patches-5.15/702-phy-Add-2.5G-SGMII-interface-mode.patch b/target/linux/layerscape/patches-5.15/702-phy-Add-2.5G-SGMII-interface-mode.patch
index 46c304032db33bb22c3e68cc7e827ed4821c138e..daf6cf3ce7a0267d77e544f804e666fda5ceb541 100644 (file)
--- a/target/linux/layerscape/patches-5.15/702-phy-Add-2.5G-SGMII-interface-mode.patch
+++ b/target/linux/layerscape/patches-5.15/702-phy-Add-2.5G-SGMII-interface-mode.patch
@@ -13,7 +13,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
 
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -398,6 +398,7 @@ void phylink_get_linkmodes(unsigned long
+@@ -400,6 +400,7 @@ void phylink_get_linkmodes(unsigned long
                caps |= MAC_1000FD;
                break;
  
@@ -21,7 +21,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
        case PHY_INTERFACE_MODE_2500BASEX:
                caps |= MAC_2500FD;
                break;
-@@ -651,6 +652,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 +34,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: