diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2023-11-19 12:52:55 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2024-01-26 17:52:24 +0100 |
| commit | 1b3259eb5cdcfecbfae7809b8a9febdbe22ac65f (patch) | |
| tree | 8c6a01ed5b90a307c92f5ef4ebeb9ffabaf926cf /target/linux/generic/hack-5.15/720-net-phy-add-aqr-phys.patch | |
| parent | 0fd3a6c6c6f079565f1f5de4709f3d4d71fc54c8 (diff) | |
| download | upstream-1b3259eb5cdcfecbfae7809b8a9febdbe22ac65f.tar.gz upstream-1b3259eb5cdcfecbfae7809b8a9febdbe22ac65f.tar.bz2 upstream-1b3259eb5cdcfecbfae7809b8a9febdbe22ac65f.zip | |
generic: 5.15: backport upstream Aquantia PHY firmware loader patches
Backport merged upstream patch that adds support for firmware loader
from NVMEM or attached filesystem for Aquantia PHYs.
Refresh all kernel patches affected by this change.
Also update the path for aquantia .ko that got moved to dedicated
directory upstream.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
[rmilecki: port to 5.15]
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/hack-5.15/720-net-phy-add-aqr-phys.patch')
| -rw-r--r-- | target/linux/generic/hack-5.15/720-net-phy-add-aqr-phys.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/hack-5.15/720-net-phy-add-aqr-phys.patch b/target/linux/generic/hack-5.15/720-net-phy-add-aqr-phys.patch index d8ec95b3747..c4a915956e9 100644 --- a/target/linux/generic/hack-5.15/720-net-phy-add-aqr-phys.patch +++ b/target/linux/generic/hack-5.15/720-net-phy-add-aqr-phys.patch @@ -7,8 +7,8 @@ PHYs AQR113C and AQR813. Signed-off-by: Birger Koblitz <git@birger-koblitz.de> ---- a/drivers/net/phy/aquantia_main.c -+++ b/drivers/net/phy/aquantia_main.c +--- a/drivers/net/phy/aquantia/aquantia_main.c ++++ b/drivers/net/phy/aquantia/aquantia_main.c @@ -23,6 +23,7 @@ #define PHY_ID_AQCS109 0x03a1b5c2 #define PHY_ID_AQR405 0x03a1b4b0 @@ -17,7 +17,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de> #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3) -@@ -415,6 +416,49 @@ static int aqr107_read_rate(struct phy_d +@@ -360,6 +361,49 @@ static int aqr107_read_rate(struct phy_d return 0; } @@ -67,7 +67,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de> static int aqr107_read_status(struct phy_device *phydev) { int val, ret; -@@ -554,7 +598,7 @@ static void aqr107_chip_info(struct phy_ +@@ -499,7 +543,7 @@ static void aqr107_chip_info(struct phy_ build_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID, val); prov_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_PROV_ID, val); @@ -76,7 +76,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de> fw_major, fw_minor, build_id, prov_id); } -@@ -811,7 +855,7 @@ static struct phy_driver aqr_driver[] = +@@ -762,7 +806,7 @@ static struct phy_driver aqr_driver[] = .config_aneg = aqr_config_aneg, .config_intr = aqr_config_intr, .handle_interrupt = aqr_handle_interrupt, @@ -85,7 +85,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de> .get_tunable = aqr107_get_tunable, .set_tunable = aqr107_set_tunable, .suspend = aqr107_suspend, -@@ -821,6 +865,24 @@ static struct phy_driver aqr_driver[] = +@@ -772,6 +816,24 @@ static struct phy_driver aqr_driver[] = .get_stats = aqr107_get_stats, .link_change_notify = aqr107_link_change_notify, }, @@ -110,7 +110,7 @@ Signed-off-by: Birger Koblitz <git@birger-koblitz.de> }; module_phy_driver(aqr_driver); -@@ -834,6 +896,7 @@ static struct mdio_device_id __maybe_unu +@@ -785,6 +847,7 @@ static struct mdio_device_id __maybe_unu { PHY_ID_MATCH_MODEL(PHY_ID_AQCS109) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR405) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR113C) }, |