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/148-net-macb-Add-default-usrio-config-to-default-gem-con.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/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch')
| -rw-r--r-- | target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch b/target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch index b5d4c3237c..721ddaea00 100644 --- a/target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch +++ b/target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch @@ -20,7 +20,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 -@@ -3860,6 +3860,13 @@ static int macb_init(struct platform_dev +@@ -3868,6 +3868,13 @@ static int macb_init(struct platform_dev return 0; } @@ -34,7 +34,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #if defined(CONFIG_OF) /* 1518 rounded up */ #define AT91ETHER_MAX_RBUFF_SZ 0x600 -@@ -4375,13 +4382,6 @@ static int fu540_c000_init(struct platfo +@@ -4383,13 +4390,6 @@ static int fu540_c000_init(struct platfo return macb_init(pdev); } @@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static const struct macb_usrio_config sama7g5_usrio = { .mii = 0, .rmii = 1, -@@ -4530,6 +4530,7 @@ static const struct macb_config default_ +@@ -4538,6 +4538,7 @@ static const struct macb_config default_ .dma_burst_length = 16, .clk_init = macb_clk_init, .init = macb_init, |