aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/119-net-macb-add-support-for-sama7g5-gem-interface.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/119-net-macb-add-support-for-sama7g5-gem-interface.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/119-net-macb-add-support-for-sama7g5-gem-interface.patch')
-rw-r--r--target/linux/at91/patches-5.10/119-net-macb-add-support-for-sama7g5-gem-interface.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/at91/patches-5.10/119-net-macb-add-support-for-sama7g5-gem-interface.patch b/target/linux/at91/patches-5.10/119-net-macb-add-support-for-sama7g5-gem-interface.patch
index 1bc648842c..78a222e657 100644
--- a/target/linux/at91/patches-5.10/119-net-macb-add-support-for-sama7g5-gem-interface.patch
+++ b/target/linux/at91/patches-5.10/119-net-macb-add-support-for-sama7g5-gem-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
-@@ -4383,6 +4383,14 @@ static const struct macb_usrio_config ma
+@@ -4387,6 +4387,14 @@ static const struct macb_usrio_config ma
.refclk = MACB_BIT(CLKEN),
};
@@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct macb_config fu540_c000_config = {
.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |
MACB_CAPS_GEM_HAS_PTP,
-@@ -4476,6 +4484,14 @@ static const struct macb_config zynq_con
+@@ -4480,6 +4488,14 @@ static const struct macb_config zynq_con
.usrio = &macb_default_usrio,
};
@@ -44,7 +44,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 },
-@@ -4493,6 +4509,7 @@ static const struct of_device_id macb_dt
+@@ -4497,6 +4513,7 @@ static const struct of_device_id macb_dt
{ .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config},
{ .compatible = "cdns,zynq-gem", .data = &zynq_config },
{ .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config },