b46655aaa0
removed upstreamed patches:
generic/backport-6.6/621-proc-fix-missing-pde_set_flags.patch [1]
generic/pending-6.6/742-net-ethernet-mtk_eth_soc-fix-tx-vlan-tag-for-llc-pac.patch [2]
manually rebase patches:
bcm27xx/patches-6.6/950-0518-net-macb-Also-set-DMA-coherent-mask.patch [3]
all other patches autorefreshed.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.105&id=698abcf08818cb7bafb978f4c9f6674d6a825d10
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.105&id=61b80fbdc0726317f72f9074e10126e0eb0e49c5
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.105&id=5430388a81113e62a2d48b5d7dc1e76231908ebf
Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20013
(cherry picked from commit 67c5ec7092)
Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20036
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From f9f0024bd9bf04a58b64bae356be4c04022d23bc Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Mon, 11 Nov 2024 16:40:07 +0000
|
|
Subject: [PATCH] net: macb: Add support for Raspberry Pi RP1 ethernet
|
|
controller
|
|
|
|
The RP1 chip has the Cadence GEM block, but wants the tx_clock
|
|
to always run at 125MHz, in the same way as sama7g5.
|
|
Add the relevant configuration.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/net/ethernet/cadence/macb_main.c | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/cadence/macb_main.c
|
|
+++ b/drivers/net/ethernet/cadence/macb_main.c
|
|
@@ -5027,6 +5027,17 @@ static const struct macb_config versal_c
|
|
.usrio = &macb_default_usrio,
|
|
};
|
|
|
|
+static const struct macb_config raspberrypi_rp1_config = {
|
|
+ .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_CLK_HW_CHG |
|
|
+ MACB_CAPS_JUMBO |
|
|
+ MACB_CAPS_GEM_HAS_PTP,
|
|
+ .dma_burst_length = 16,
|
|
+ .clk_init = macb_clk_init,
|
|
+ .init = macb_init,
|
|
+ .usrio = &macb_default_usrio,
|
|
+ .jumbo_max_len = 10240,
|
|
+};
|
|
+
|
|
static const struct of_device_id macb_dt_ids[] = {
|
|
{ .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
|
|
{ .compatible = "cdns,macb" },
|
|
@@ -5047,6 +5058,7 @@ static const struct of_device_id macb_dt
|
|
{ .compatible = "microchip,mpfs-macb", .data = &mpfs_config },
|
|
{ .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config },
|
|
{ .compatible = "microchip,sama7g5-emac", .data = &sama7g5_emac_config },
|
|
+ { .compatible = "raspberrypi,rp1-gem", .data = &raspberrypi_rp1_config },
|
|
{ .compatible = "xlnx,zynqmp-gem", .data = &zynqmp_config},
|
|
{ .compatible = "xlnx,zynq-gem", .data = &zynq_config },
|
|
{ .compatible = "xlnx,versal-gem", .data = &versal_config},
|