summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle2024-10-15 20:15:19 +0000
committerDaniel Golle2024-10-15 20:20:19 +0000
commit4d81f40d630ff3ac38ac6fadeaf815d15abe403a (patch)
tree44ab54e28f1a346c00be1a4ffe2210171b0c956d
parent3e6de5d77a8b8cda1e02250179d964b840c203fa (diff)
downloadopenwrt-4d81f40d630ff3ac38ac6fadeaf815d15abe403a.tar.gz
generic: fix kernel version and ordering of Aquantia backports
Two patches declared as accepted in v6.13 were already accepted for v6.12. Fix filenames and order of patches applied. Reported-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Fixes: 8cc049cec2 ("generic: phy: aquantia: move accepted patches to backport-6.6") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--target/linux/generic/backport-6.6/837-v6.12-net-phy-aquantia-fix-setting-active_low-bit.patch (renamed from target/linux/generic/backport-6.6/839-v6.13-net-phy-aquantia-fix-setting-active_low-bit.patch)0
-rw-r--r--target/linux/generic/backport-6.6/838-v6.12-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch (renamed from target/linux/generic/backport-6.6/840-v6.13-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch)4
-rw-r--r--target/linux/generic/backport-6.6/839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch (renamed from target/linux/generic/backport-6.6/837-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch)2
-rw-r--r--target/linux/generic/backport-6.6/840-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch (renamed from target/linux/generic/backport-6.6/838-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch)0
4 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-6.6/839-v6.13-net-phy-aquantia-fix-setting-active_low-bit.patch b/target/linux/generic/backport-6.6/837-v6.12-net-phy-aquantia-fix-setting-active_low-bit.patch
index 6072e02fd4..6072e02fd4 100644
--- a/target/linux/generic/backport-6.6/839-v6.13-net-phy-aquantia-fix-setting-active_low-bit.patch
+++ b/target/linux/generic/backport-6.6/837-v6.12-net-phy-aquantia-fix-setting-active_low-bit.patch
diff --git a/target/linux/generic/backport-6.6/840-v6.13-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch b/target/linux/generic/backport-6.6/838-v6.12-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch
index 6d71b3d7a5..5c3494ae33 100644
--- a/target/linux/generic/backport-6.6/840-v6.13-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch
+++ b/target/linux/generic/backport-6.6/838-v6.12-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch
@@ -49,7 +49,7 @@ Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/aquantia/aquantia_main.c
+++ b/drivers/net/phy/aquantia/aquantia_main.c
-@@ -530,7 +530,7 @@ static int aqr107_config_init(struct phy
+@@ -501,7 +501,7 @@ static int aqr107_config_init(struct phy
{
struct aqr107_priv *priv = phydev->priv;
u32 led_active_low;
@@ -58,7 +58,7 @@ Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
/* Check that the PHY interface type is compatible */
if (phydev->interface != PHY_INTERFACE_MODE_SGMII &&
-@@ -570,10 +570,9 @@ static int aqr107_config_init(struct phy
+@@ -537,10 +537,9 @@ static int aqr107_config_init(struct phy
/* Restore LED polarity state after reset */
for_each_set_bit(led_active_low, &priv->leds_active_low, AQR_MAX_LEDS) {
diff --git a/target/linux/generic/backport-6.6/837-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch b/target/linux/generic/backport-6.6/839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch
index 9522bcaa45..c1655ce71e 100644
--- a/target/linux/generic/backport-6.6/837-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch
+++ b/target/linux/generic/backport-6.6/839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch
@@ -104,4 +104,4 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+
/* Restore LED polarity state after reset */
for_each_set_bit(led_active_low, &priv->leds_active_low, AQR_MAX_LEDS) {
- ret = aqr_phy_led_active_low_set(phydev, index, led_active_low);
+ ret = aqr_phy_led_active_low_set(phydev, led_active_low, true);
diff --git a/target/linux/generic/backport-6.6/838-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch b/target/linux/generic/backport-6.6/840-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch
index 73be78a058..73be78a058 100644
--- a/target/linux/generic/backport-6.6/838-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch
+++ b/target/linux/generic/backport-6.6/840-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch