diff options
author | John Audia <graysky@archlinux.us> | 2022-03-16 16:06:23 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-03-19 16:13:58 +0100 |
commit | b04d38a2eaa5604aa7216e0c02846d96dc2d317f (patch) | |
tree | d215b7bd4bba934f2e72716f32a3df618682b71d /target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch | |
parent | 048f0b170296c6fc2e2076bbe7c07b4c840d31f6 (diff) | |
download | upstream-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/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 57792a593f..b5d4c3237c 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 -@@ -3837,6 +3837,13 @@ static int macb_init(struct platform_dev +@@ -3860,6 +3860,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 -@@ -4352,13 +4359,6 @@ static int fu540_c000_init(struct platfo +@@ -4375,13 +4382,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, -@@ -4507,6 +4507,7 @@ static const struct macb_config default_ +@@ -4530,6 +4530,7 @@ static const struct macb_config default_ .dma_burst_length = 16, .clk_init = macb_clk_init, .init = macb_init, |