diff options
| author | John Audia <therealgraysky@proton.me> | 2022-06-29 04:22:49 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-01 20:28:35 +0200 |
| commit | 6b44a6e73184593845d3521b1e21fd44e3a9d2f4 (patch) | |
| tree | 6b58faf12e83b541605e602811f540b823ab1380 /target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch | |
| parent | 66da295f5a919cf15e6d419a021cf579282d3526 (diff) | |
| download | upstream-6b44a6e73184593845d3521b1e21fd44e3a9d2f4.tar.gz upstream-6b44a6e73184593845d3521b1e21fd44e3a9d2f4.tar.bz2 upstream-6b44a6e73184593845d3521b1e21fd44e3a9d2f4.zip | |
kernel: bump 5.10 to 5.10.127
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 433dc5892a60003753655aac6e6a4b59fb13b2e4)
Diffstat (limited to 'target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch')
| -rw-r--r-- | target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch b/target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch index e3541400d7..ae85a21f97 100644 --- a/target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch +++ b/target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch @@ -27,7 +27,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> #define PHY_ID_AQR813 0x31c31cb2 #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 -@@ -123,6 +125,29 @@ +@@ -125,6 +127,29 @@ #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1) #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0) @@ -57,7 +57,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> struct aqr107_hw_stat { const char *name; int reg; -@@ -243,6 +268,51 @@ static int aqr_config_aneg(struct phy_de +@@ -256,6 +281,51 @@ static int aqr_config_aneg(struct phy_de return genphy_c45_check_and_restart_aneg(phydev, changed); } @@ -109,7 +109,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> static int aqr_config_intr(struct phy_device *phydev) { bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED; -@@ -738,6 +808,30 @@ static struct phy_driver aqr_driver[] = +@@ -751,6 +821,30 @@ static struct phy_driver aqr_driver[] = .get_stats = aqr107_get_stats, .link_change_notify = aqr107_link_change_notify, }, @@ -140,7 +140,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> }; module_phy_driver(aqr_driver); -@@ -748,9 +842,11 @@ static struct mdio_device_id __maybe_unu +@@ -761,9 +855,11 @@ static struct mdio_device_id __maybe_unu { PHY_ID_MATCH_MODEL(PHY_ID_AQR105) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, |