layerscape: kernel: refresh 6.1 patches

Kernel patches copied from 5.15 need to be refreshed.

Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>

diff --git a/target/linux/layerscape/patches-6.1/400-LF-20-3-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch b/target/linux/layerscape/patches-6.1/400-LF-20-3-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch
index 20de0a2deaf6d77e7a5cf19b94cac7638e87364e..b06c0f8133a12b7c2c65a514f849fd4a34e7cced 100644 (file)
--- a/target/linux/layerscape/patches-6.1/400-LF-20-3-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch
+++ b/target/linux/layerscape/patches-6.1/400-LF-20-3-mtd-spi-nor-Use-1-bit-mode-of-spansion-s25fs.patch
@@ -15,7 +15,7 @@ Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
 
 --- a/drivers/mtd/spi-nor/spansion.c
 +++ b/drivers/mtd/spi-nor/spansion.c
-@@ -385,8 +385,8 @@ static const struct flash_info spansion_
+@@ -398,8 +398,8 @@ static const struct flash_info spansion_
                MFR_FLAGS(USE_CLSR)
        },
        { "s25fs512s",  INFO6(0x010220, 0x4d0081, 256 * 1024, 256)

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 eed69f9e89e4ee6b0ed39f035ef0f69b26b16085..77c976407875f45d5a1193483c369568166a07b3 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
-@@ -193,6 +193,7 @@ static int phylink_interface_max_speed(p
+@@ -199,6 +199,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
-@@ -156,6 +156,7 @@ typedef enum {
+@@ -157,6 +157,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;
  
-@@ -275,6 +276,8 @@ static inline const char *phy_modes(phy_
+@@ -276,6 +277,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 79586b742e0752c8178fd96634e7a8667c0bb956..92e3b63c92371f50c47c9b0ead395e89be144dfe 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
@@ -34,7 +34,7 @@ diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
 index 2805b04d6402..a1e34b127401 100644
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -479,6 +479,7 @@ unsigned long phylink_get_capabilities(phy_interface_t interface,
+@@ -485,6 +485,7 @@ unsigned long phylink_get_capabilities(phy_interface_t interface,
                break;
  
        case PHY_INTERFACE_MODE_2500BASEX: