aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2022-03-16 16:06:23 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-03-19 16:13:58 +0100
commitb04d38a2eaa5604aa7216e0c02846d96dc2d317f (patch)
treed215b7bd4bba934f2e72716f32a3df618682b71d /target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch
parent048f0b170296c6fc2e2076bbe7c07b4c840d31f6 (diff)
downloadupstream-b04d38a2eaa5604aa7216e0c02846d96dc2d317f.tar.gz
upstream-b04d38a2eaa5604aa7216e0c02846d96dc2d317f.tar.bz2
upstream-b04d38a2eaa5604aa7216e0c02846d96dc2d317f.zip
kernel: bump 5.10 to 5.10.106
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch')
-rw-r--r--target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch b/target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch
index 82fc50cce1..e8b04742f2 100644
--- a/target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch
+++ b/target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
-@@ -4468,6 +4468,14 @@ static const struct macb_config sama7g5_
+@@ -4491,6 +4491,14 @@ static const struct macb_config sama7g5_
.usrio = &sama7g5_usrio,
};
@@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct of_device_id macb_dt_ids[] = {
{ .compatible = "cdns,at32ap7000-macb" },
{ .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
-@@ -4486,6 +4494,7 @@ static const struct of_device_id macb_dt
+@@ -4509,6 +4517,7 @@ static const struct of_device_id macb_dt
{ .compatible = "cdns,zynq-gem", .data = &zynq_config },
{ .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config },
{ .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config },