Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

generic: fix kernel version and ordering of Aquantia backports

Browse Source 
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>
This commit is contained in:
Daniel Golle 2024-10-15 21:15:19 +01:00
parent 3e6de5d77a
commit 4d81f40d63
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
target/linux/generic/backport-6.6/839-v6.13-net-phy-aquantia-fix-setting-active_low-bit.patch → target/linux/generic/backport-6.6/837-v6.12-net-phy-aquantia-fix-setting-active_low-bit.patch
View File

4
target/linux/generic/backport-6.6/840-v6.13-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch → target/linux/generic/backport-6.6/838-v6.12-net-phy-aquantia-fix-applying-active_low-bit-after-reset.patch
View File

@ -49,7 +49,7 @@ Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/aquantia/aquantia_main.c --- a/drivers/net/phy/aquantia/aquantia_main.c
+++ b/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; struct aqr107_priv *priv = phydev->priv;
u32 led_active_low; 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 */ /* Check that the PHY interface type is compatible */
if (phydev->interface != PHY_INTERFACE_MODE_SGMII && 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 */ /* Restore LED polarity state after reset */
for_each_set_bit(led_active_low, &priv->leds_active_low, AQR_MAX_LEDS) { for_each_set_bit(led_active_low, &priv->leds_active_low, AQR_MAX_LEDS) {

2
target/linux/generic/backport-6.6/837-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch → target/linux/generic/backport-6.6/839-v6.13-net-phy-aquantia-allow-forcing-order-of-MDI-pairs.patch
View File

@ -104,4 +104,4 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+ +
/* Restore LED polarity state after reset */ /* Restore LED polarity state after reset */
for_each_set_bit(led_active_low, &priv->leds_active_low, AQR_MAX_LEDS) { 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);

0
target/linux/generic/backport-6.6/838-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch → target/linux/generic/backport-6.6/840-v6.13-net-phy-aquantia-fix-return-value-check-in-aqr107_co.patch
View File