layerscape: refresh patches-6.1

Patches no longer cleanly apply after commit c2c741ccce ("generic:
6.1: initial backport of at803x PHY driver cleanup"). Refresh patches
to address that.

Fixes: c2c741ccce ("generic: 6.1: initial backport of at803x PHY driver cleanup")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/layerscape/patches-6.1/702-phy-Add-2.5G-SGMII-interface-mode.patch b/target/linux/layerscape/patches-6.1/702-phy-Add-2.5G-SGMII-interface-mode.patch
index 77c976407875f45d5a1193483c369568166a07b3..6af915da90653809b210a8ea67035d6447ce700c 100644 (file)
--- a/target/linux/layerscape/patches-6.1/702-phy-Add-2.5G-SGMII-interface-mode.patch
+++ b/target/linux/layerscape/patches-6.1/702-phy-Add-2.5G-SGMII-interface-mode.patch
@@ -25,7 +25,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
        case PHY_INTERFACE_MODE_QUSGMII:
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -199,6 +199,7 @@ static int phylink_interface_max_speed(p
+@@ -200,6 +200,7 @@ static int phylink_interface_max_speed(p
                return SPEED_1000;
  
        case PHY_INTERFACE_MODE_2500BASEX:
@@ -35,7 +35,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
        case PHY_INTERFACE_MODE_5GBASER:
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
-@@ -157,6 +157,7 @@ typedef enum {
+@@ -159,6 +159,7 @@ typedef enum {
        PHY_INTERFACE_MODE_10GKR,
        PHY_INTERFACE_MODE_QUSGMII,
        PHY_INTERFACE_MODE_1000BASEKX,
@@ -43,7 +43,7 @@ Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
        PHY_INTERFACE_MODE_MAX,
  } phy_interface_t;
  
-@@ -276,6 +277,8 @@ static inline const char *phy_modes(phy_
+@@ -280,6 +281,8 @@ static inline const char *phy_modes(phy_
                return "100base-x";
        case PHY_INTERFACE_MODE_QUSGMII:
                return "qusgmii";

diff --git a/target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch b/target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch
index f0d71009456c5d02ef1061735583b708c2f3f142..265756ea7032632453e473fb4b74cc69ffd531c0 100644 (file)
--- a/target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch
+++ b/target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch
@@ -32,7 +32,7 @@ Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
 
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -485,6 +485,7 @@ unsigned long phylink_get_capabilities(p
+@@ -487,6 +487,7 @@ unsigned long phylink_get_capabilities(p
                break;
  
        case PHY_INTERFACE_MODE_2500BASEX: