diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2024-01-16 13:41:06 +0000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2024-01-16 13:42:02 +0000 |
| commit | 39ce9338422de3c067d6889d13710ca18108818c (patch) | |
| tree | fd7da363717cccff47fbde44e35f12c167da7d41 /target/linux/layerscape | |
| parent | 81b4160a6f9b87d454d2f6b57968ca3c4c354cc3 (diff) | |
| download | openwrt-39ce9338422de3c067d6889d13710ca18108818c.tar.gz openwrt-39ce9338422de3c067d6889d13710ca18108818c.tar.bz2 openwrt-39ce9338422de3c067d6889d13710ca18108818c.zip | |
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>
Diffstat (limited to 'target/linux/layerscape')
2 files changed, 4 insertions, 4 deletions
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 77c9764078..6af915da90 100644 --- 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 f0d7100945..265756ea70 100644 --- 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: |