diff options
| author | John Audia <therealgraysky@proton.me> | 2022-07-04 07:41:15 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-11 00:49:25 +0200 |
| commit | 552d76f2bebe182ce9352aed357268f97d2c626f (patch) | |
| tree | 075d7393d6359977ed0d272c66e1a4107dd92aaa /target/linux/generic/hack-5.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch | |
| parent | 436fad7a3edaf071b45d8201e839acd914be4d10 (diff) | |
| download | upstream-552d76f2bebe182ce9352aed357268f97d2c626f.tar.gz upstream-552d76f2bebe182ce9352aed357268f97d2c626f.tar.bz2 upstream-552d76f2bebe182ce9352aed357268f97d2c626f.zip | |
kernel: bump 5.15 to 5.15.51
Manual rebase by Marty Jones:
bcm27xx/patches-5.15/950-0078-BCM2708-Add-core-Device-Tree-support.patch
All other patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
Signed-off-by: Marty Jones <mj8263788@gmail.com>
[Apply same changes to new dts entry in modified file]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 | 8 |
1 files changed, 4 insertions, 4 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 37724f6895..f1901853e1 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,7 +27,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> #define PHY_ID_AQR813 0x31c31cb2 #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 -@@ -124,6 +126,29 @@ +@@ -126,6 +128,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; -@@ -244,6 +269,51 @@ static int aqr_config_aneg(struct phy_de +@@ -257,6 +282,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; -@@ -767,6 +837,30 @@ static struct phy_driver aqr_driver[] = +@@ -780,6 +850,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); -@@ -777,9 +871,11 @@ static struct mdio_device_id __maybe_unu +@@ -790,9 +884,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) }, |