diff options
| author | John Audia <therealgraysky@proton.me> | 2022-09-28 13:26:15 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-02 20:21:55 +0200 |
| commit | e71a360f570e0e6f8ab19d1f927331b1cd1aca75 (patch) | |
| tree | b195751c834db314e8d31182eadfdd5b9ffd3cce /target/linux/generic/hack-5.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch | |
| parent | e1b009c1fe546b1b91a0ebc538325511af7ee077 (diff) | |
| download | upstream-e71a360f570e0e6f8ab19d1f927331b1cd1aca75.tar.gz upstream-e71a360f570e0e6f8ab19d1f927331b1cd1aca75.tar.bz2 upstream-e71a360f570e0e6f8ab19d1f927331b1cd1aca75.zip | |
kernel: bump 5.15 to 5.15.71
Removed upstreamed:
uml/patches-5.15/001-um-fix-default-console-kernel-parameter.patch[1]
All other patches automatically rebased
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.71&id=e1dbe8a62098b20f5093cf75ade2f2dc9259b006
Signed-off-by: John Audia <therealgraysky@proton.me>
Compile-tested: mvebu/cortexa72 (RB5009UG+S+IN)
Run-tested: mvebu/cortexa72 (RB5009UG+S+IN)
Diffstat (limited to 'target/linux/generic/hack-5.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch')
| -rw-r--r-- | target/linux/generic/hack-5.15/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.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch b/target/linux/generic/hack-5.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch index f1901853e1..211696c568 100644 --- a/target/linux/generic/hack-5.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch +++ b/target/linux/generic/hack-5.15/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 -@@ -126,6 +128,29 @@ - #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1) - #define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0) +@@ -135,6 +137,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; -@@ -257,6 +282,51 @@ static int aqr_config_aneg(struct phy_de +@@ -266,6 +291,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; -@@ -780,6 +850,30 @@ static struct phy_driver aqr_driver[] = +@@ -825,6 +895,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); -@@ -790,9 +884,11 @@ static struct mdio_device_id __maybe_unu +@@ -835,9 +929,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) }, |