layerscape: kernel: refresh 6.6 patches

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

diff --git a/target/linux/layerscape/patches-6.6/702-phy-Add-2.5G-SGMII-interface-mode.patch b/target/linux/layerscape/patches-6.6/702-phy-Add-2.5G-SGMII-interface-mode.patch
index 8beee8f2dc1af75950b356319bf130ea04141338..abb0a1e5ed9c96a9ff34ab8470be4bd14bb6383b 100644 (file)
--- a/target/linux/layerscape/patches-6.6/702-phy-Add-2.5G-SGMII-interface-mode.patch
+++ b/target/linux/layerscape/patches-6.6/702-phy-Add-2.5G-SGMII-interface-mode.patch
@@ -1,4 +1,4 @@
-From fd32b1bc9a49919d3d59a50d775d03fe7ca5e654 Mon Sep 17 00:00:00 2001
+From 3823e4e1078a95e26b9a69e88c9bf862b0267e1c Mon Sep 17 00:00:00 2001
 From: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
 Date: Wed, 29 Nov 2017 15:27:57 +0530
 Subject: [PATCH] phy: Add 2.5G SGMII interface mode
@@ -9,13 +9,13 @@ in existing phy_interface list
 Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
 ---
  drivers/net/phy/phy-core.c | 1 +
- drivers/net/phy/phylink.c  | 1 +
+ drivers/net/phy/phylink.c  | 2 ++
  include/linux/phy.h        | 3 +++
- 3 files changed, 5 insertions(+)
+ 3 files changed, 6 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
+@@ -138,6 +138,7 @@ int phy_interface_num_ports(phy_interfac
        case PHY_INTERFACE_MODE_RXAUI:
        case PHY_INTERFACE_MODE_XAUI:
        case PHY_INTERFACE_MODE_1000BASEKX:
@@ -33,9 +33,17 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
                return SPEED_2500;
  
        case PHY_INTERFACE_MODE_5GBASER:
+@@ -526,6 +527,7 @@ unsigned long phylink_get_capabilities(p
+               break;
+ 
+       case PHY_INTERFACE_MODE_2500BASEX:
++      case PHY_INTERFACE_MODE_2500SGMII:
+               caps |= MAC_2500FD;
+               break;
+ 
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -159,6 +159,7 @@ typedef enum {
+@@ -165,6 +165,7 @@ typedef enum {
        PHY_INTERFACE_MODE_10GKR,
        PHY_INTERFACE_MODE_QUSGMII,
        PHY_INTERFACE_MODE_1000BASEKX,
@@ -43,7 +51,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
        PHY_INTERFACE_MODE_MAX,
  } phy_interface_t;
  
-@@ -280,6 +281,8 @@ static inline const char *phy_modes(phy_
+@@ -286,6 +287,8 @@ static inline const char *phy_modes(phy_
                return "100base-x";
        case PHY_INTERFACE_MODE_QUSGMII:
                return "qusgmii";