mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-01-27 23:47:19 +01:00
kernel: net: phy: mxl-gpy: replace patch with upstream commit
Replace accepted patch with backported upstream commit and refresh patches. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
parent
0bab65dfa7
commit
6ac605e4c6
2 changed files with 8 additions and 6 deletions
|
|
@ -1,16 +1,18 @@
|
|||
From aaf0094daf0d7a0e4599280341710c98ba1e9d35 Mon Sep 17 00:00:00 2001
|
||||
From 9da9633f2f02df7da67ab3b6f84eda4956ae1c5a Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Golle <daniel@makrotopia.org>
|
||||
Date: Wed, 7 Jan 2026 13:48:16 +0000
|
||||
Date: Wed, 7 Jan 2026 15:39:16 +0000
|
||||
Subject: [PATCH] net: phy: mxl-gpy: implement SGMII in-band configuration
|
||||
|
||||
SGMII in-band autonegotiation was previously kept untouched (and restored
|
||||
after switching back from 2500Base-X to SGMII). Now that the kernel offers
|
||||
a way to announce in-band capabilities and enable/disable in-band AN,
|
||||
a way to announce in-band capabilities and nable/disable in-band AN,
|
||||
implement the .inband_caps and .config_inband driver ops.
|
||||
This moves the responsibility to configure SGMII in-band AN from the PHY
|
||||
driver to phylink.
|
||||
|
||||
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
Link: https://patch.msgid.link/70f07e46dd96e239a9711e6073e8c04c1d8672d4.1767800226.git.daniel@makrotopia.org
|
||||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
---
|
||||
drivers/net/phy/mxl-gpy.c | 61 ++++++++++++++++++++++++++++++---------
|
||||
1 file changed, 47 insertions(+), 14 deletions(-)
|
||||
|
|
@ -39,7 +41,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|||
}
|
||||
|
||||
@@ -1022,6 +1008,27 @@ static int gpy_led_polarity_set(struct p
|
||||
return -EINVAL;
|
||||
unreachable();
|
||||
}
|
||||
|
||||
+static unsigned int gpy_inband_caps(struct phy_device *phydev,
|
||||
|
|
@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||
static struct phy_driver xway_gphy[] = {
|
||||
--- a/drivers/net/phy/mxl-gpy.c
|
||||
+++ b/drivers/net/phy/mxl-gpy.c
|
||||
@@ -1019,7 +1019,7 @@ static int gpy_led_polarity_set(struct p
|
||||
@@ -1005,7 +1005,7 @@ static int gpy_led_polarity_set(struct p
|
||||
if (force_active_high)
|
||||
return phy_clear_bits(phydev, PHY_LED, PHY_LED_POLARITY(index));
|
||||
|
||||
|
|
@ -61,4 +61,4 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||
+ return -EINVAL;
|
||||
}
|
||||
|
||||
static struct phy_driver gpy_drivers[] = {
|
||||
static unsigned int gpy_inband_caps(struct phy_device *phydev,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue