aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-07-04 07:41:15 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-11 00:49:25 +0200
commit552d76f2bebe182ce9352aed357268f97d2c626f (patch)
tree075d7393d6359977ed0d272c66e1a4107dd92aaa /target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
parent436fad7a3edaf071b45d8201e839acd914be4d10 (diff)
downloadupstream-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/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch')
-rw-r--r--target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch b/target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
index e27178f8a1..f7ccc454e9 100644
--- a/target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
+++ b/target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
@@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
#define PHY_ID_AQR113 0x31c31c40
#define PHY_ID_AQR113C 0x31c31c12
#define PHY_ID_AQCS109 0x03a1b5c2
-@@ -857,6 +859,30 @@ static struct phy_driver aqr_driver[] =
+@@ -870,6 +872,30 @@ static struct phy_driver aqr_driver[] =
.get_stats = aqr107_get_stats,
},
{
@@ -52,7 +52,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
PHY_ID_MATCH_MODEL(PHY_ID_AQR113),
.name = "Aquantia AQR113",
.config_aneg = aqr_config_aneg,
-@@ -887,6 +913,8 @@ static struct mdio_device_id __maybe_unu
+@@ -900,6 +926,8 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },