diff options
author | John Audia <therealgraysky@proton.me> | 2022-09-28 16:05:00 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-02 20:21:55 +0200 |
commit | eed0a31b90e4feeb65f3b54853bd4db1f5bcd524 (patch) | |
tree | d0c5bf875560701bf852fe5df718a566d0c67a85 /target/linux/generic/hack-5.10/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch | |
parent | 8fe67fae1d619467b2b3300178d4309f17cfdb54 (diff) | |
download | upstream-eed0a31b90e4feeb65f3b54853bd4db1f5bcd524.tar.gz upstream-eed0a31b90e4feeb65f3b54853bd4db1f5bcd524.tar.bz2 upstream-eed0a31b90e4feeb65f3b54853bd4db1f5bcd524.zip |
kernel: bump 5.10 to 5.10.146
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
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 | 12 |
1 files changed, 6 insertions, 6 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 ae85a21f97..42bf8951d6 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,9 +27,9 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> #define PHY_ID_AQR813 0x31c31cb2 #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 -@@ -125,6 +127,29 @@ - #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1) - #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0) +@@ -134,6 +136,29 @@ + #define AQR107_OP_IN_PROG_SLEEP 1000 + #define AQR107_OP_IN_PROG_TIMEOUT 100000 +/* registers in MDIO_MMD_VEND1 region */ +#define AQUANTIA_VND1_GLOBAL_SC 0x000 @@ -57,7 +57,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> struct aqr107_hw_stat { const char *name; int reg; -@@ -256,6 +281,51 @@ static int aqr_config_aneg(struct phy_de +@@ -265,6 +290,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; -@@ -751,6 +821,30 @@ static struct phy_driver aqr_driver[] = +@@ -796,6 +866,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); -@@ -761,9 +855,11 @@ static struct mdio_device_id __maybe_unu +@@ -806,9 +900,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) }, |