Skip to content

[PW_SID:1055816] riscv: dts: sifive: fu740: Fix compatible strings per IP versioning #1481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linux-riscv-bot wants to merge 5 commits into
base: workflow__riscv__fixes
Choose a base branch
from
Open

[PW_SID:1055816] riscv: dts: sifive: fu740: Fix compatible strings per IP versioning #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d11210d
dt-bindings: net: macb: Add SiFive FU740-C000 support
Max-Hsu Feb 20, 2026
dcf3909
dt-bindings: interrupt-controller: Add SiFive FU740-C000 PLIC
Max-Hsu Feb 20, 2026
9f0cc4f
net: macb: Add support for SiFive FU740-C000
Max-Hsu Feb 20, 2026
ccb94c3
riscv: dts: sifive: fu740: Use correct ethernet compatible string
Max-Hsu Feb 20, 2026
8c6216a
riscv: dts: sifive: fu740: Use correct PLIC compatible string
Max-Hsu Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ properties:
- eswin,eic7700-plic
- microchip,pic64gx-plic
- sifive,fu540-c000-plic
- sifive,fu740-c000-plic
- spacemit,k1-plic
- starfive,jh7100-plic
- starfive,jh7110-plic
Expand Down
7 changes: 5 additions & 2 deletions Documentation/devicetree/bindings/net/cdns,macb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ properties:
- mobileye,eyeq5-gem # Mobileye EyeQ5 SoCs
- raspberrypi,rp1-gem # Raspberry Pi RP1 gigabit ethernet interface
- sifive,fu540-c000-gem # SiFive FU540-C000 SoC
- sifive,fu740-c000-gem # SiFive FU740-C000 SoC

- items:
- enum:
Expand All @@ -74,7 +75,7 @@ properties:
minItems: 1
items:
- description: Basic register set
- description: GEMGXL Management block registers on SiFive FU540-C000 SoC
- description: GEMGXL Management block registers on SiFive FU540/FU740 SoCs

interrupts:
minItems: 1
Expand Down Expand Up @@ -181,7 +182,9 @@ allOf:
properties:
compatible:
contains:
const: sifive,fu540-c000-gem
enum:
- sifive,fu540-c000-gem
- sifive,fu740-c000-gem
then:
properties:
reg:
Expand Down
4 changes: 2 additions & 2 deletions arch/riscv/boot/dts/sifive/fu740-c000.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
plic0: interrupt-controller@c000000 {
#interrupt-cells = <1>;
#address-cells = <0>;
compatible = "sifive,fu540-c000-plic", "sifive,plic-1.0.0";
compatible = "sifive,fu740-c000-plic", "sifive,plic-1.0.0";
reg = <0x0 0xc000000 0x0 0x4000000>;
riscv,ndev = <69>;
interrupt-controller;
Expand Down Expand Up @@ -273,7 +273,7 @@
status = "disabled";
};
eth0: ethernet@10090000 {
compatible = "sifive,fu540-c000-gem";
compatible = "sifive,fu740-c000-gem";
interrupt-parent = <&plic0>;
interrupts = <55>;
reg = <0x0 0x10090000 0x0 0x2000>,
Expand Down
17 changes: 14 additions & 3 deletions drivers/net/ethernet/cadence/macb_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
#include <net/pkt_sched.h>
#include "macb.h"

/* This structure is only used for MACB on SiFive FU540 devices */
struct sifive_fu540_macb_mgmt {
/* This structure is used for MACB on SiFive FU540/FU740 devices */
struct sifive_macb_mgmt {
void __iomem *reg;
unsigned long rate;
struct clk_hw hw;
Expand Down Expand Up @@ -4650,7 +4650,7 @@ static const struct macb_usrio_config macb_default_usrio = {
/* max number of receive buffers */
#define AT91ETHER_MAX_RX_DESCR 9

static struct sifive_fu540_macb_mgmt *mgmt;
static struct sifive_macb_mgmt *mgmt;

static int at91ether_alloc_coherent(struct macb *lp)
{
Expand Down Expand Up @@ -5236,6 +5236,16 @@ static const struct macb_config fu540_c000_config = {
.usrio = &macb_default_usrio,
};

static const struct macb_config fu740_c000_config = {
.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |
MACB_CAPS_GEM_HAS_PTP,
.dma_burst_length = 16,
.clk_init = fu540_c000_clk_init,
.init = fu540_c000_init,
.jumbo_max_len = 10240,
.usrio = &macb_default_usrio,
};

static const struct macb_config at91sam9260_config = {
.caps = MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII,
.clk_init = macb_clk_init,
Expand Down Expand Up @@ -5411,6 +5421,7 @@ static const struct of_device_id macb_dt_ids[] = {
{ .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config}, /* deprecated */
{ .compatible = "cdns,zynq-gem", .data = &zynq_config }, /* deprecated */
{ .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config },
{ .compatible = "sifive,fu740-c000-gem", .data = &fu740_c000_config },
{ .compatible = "microchip,mpfs-macb", .data = &mpfs_config },
{ .compatible = "microchip,sama7g5-gem", .data = &sama7g5_gem_config },
{ .compatible = "microchip,sama7g5-emac", .data = &sama7g5_emac_config },
Expand Down