diff options
| author | John Audia <graysky@archlinux.us> | 2022-04-27 14:14:45 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-05-01 14:13:15 +0200 |
| commit | d90c7621f40fde2dd01d08b4463cde755173b6ed (patch) | |
| tree | 022690f0e7d53e5a60124848a61fa0e0a9120a99 /target/linux/at91/patches-5.10/120-net-macb-add-support-for-sama7g5-emac-interface.patch | |
| parent | e9c14fa85f4d517ad1729b4b2a1a5ba1b316f189 (diff) | |
| download | upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.tar.gz upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.tar.bz2 upstream-d90c7621f40fde2dd01d08b4463cde755173b6ed.zip | |
kernel: bump 5.10 to 5.10.113
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>
(cherry picked from commit e08942e76a162962892020a0f7e52ef751ec68e4)
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.patch | 4 |
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 e8b04742f2..50d31f736b 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 -@@ -4491,6 +4491,14 @@ static const struct macb_config sama7g5_ +@@ -4499,6 +4499,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 }, -@@ -4509,6 +4517,7 @@ static const struct of_device_id macb_dt +@@ -4517,6 +4525,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 }, |