From 4d81f40d630ff3ac38ac6fadeaf815d15abe403a Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Tue, 15 Oct 2024 21:15:19 +0100
Subject: [PATCH] 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>
---
...7-v6.12-net-phy-aquantia-fix-setting-active_low-bit.patch} | 0
...hy-aquantia-fix-applying-active_low-bit-after-reset.patch} | 4 ++--
...3-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch} | 2 +-
...et-phy-aquantia-fix-return-value-check-in-aqr107_co.patch} | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename target/linux/generic/backport-6.6/{839-v6.13-net-phy-aquantia-fix-setting-active_low-bit.patch => 837-v6.12-net-phy-aquantia-fix-setting-active_low-bit.patch} (100%)
rename target/linux/generic/backport-6.6/{840-v6.13-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch => 838-v6.12-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch} (95%)
rename target/linux/generic/backport-6.6/{837-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch => 839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch} (98%)
rename target/linux/generic/backport-6.6/{838-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch => 840-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch} (100%)
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
similarity index 100%
rename from target/linux/generic/backport-6.6/839-v6.13-net-phy-aquantia-fix-setting-active_low-bit.patch
rename to 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
similarity index 95%
rename from target/linux/generic/backport-6.6/840-v6.13-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch
rename to target/linux/generic/backport-6.6/838-v6.12-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch
index 6d71b3d7a52..5c3494ae331 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
similarity index 98%
rename from target/linux/generic/backport-6.6/837-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch
rename to target/linux/generic/backport-6.6/839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch
index 9522bcaa451..c1655ce71e7 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
similarity index 100%
rename from target/linux/generic/backport-6.6/838-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch
rename to target/linux/generic/backport-6.6/840-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch