aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-04-20 08:53:55 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-04-22 01:15:03 +0200
commit126c64df2bb6dec95906c1f68aa37e581ef2550f (patch)
tree3bf569ce11a6b5744a6a54394f2617ca36ad962d /target/linux/at91/patches-5.10/148-net-macb-Add-default-usrio-config-to-default-gem-con.patch
parent3887a55909aa26c3366fd0206772280da850ab16 (diff)
downloadupstream-126c64df2bb6dec95906c1f68aa37e581ef2550f.tar.gz
upstream-126c64df2bb6dec95906c1f68aa37e581ef2550f.tar.bz2
upstream-126c64df2bb6dec95906c1f68aa37e581ef2550f.zip
kernel: bump 5.10 to 5.10.178
Removed upstreamed: backport-5.10/430-v6.3-ubi-Fix-failure-attaching-when-vid_hdr-offset-equals.patch[1] 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.178&id=0279e82e148407feec88466990de14bcba9e12c0 All other patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
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.patch6
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 130646a0b3..ee09fe34ff 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
-@@ -3861,6 +3861,13 @@ static int macb_init(struct platform_dev
+@@ -3865,6 +3865,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
-@@ -4376,13 +4383,6 @@ static int fu540_c000_init(struct platfo
+@@ -4380,13 +4387,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,
-@@ -4531,6 +4531,7 @@ static const struct macb_config default_
+@@ -4535,6 +4535,7 @@ static const struct macb_config default_
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,