62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
From 0b2b2c260e4f6d088afe7940d036d154d3076ff5 Mon Sep 17 00:00:00 2001
|
|
From: Fedora Kernel Team <kernel-team@fedoraproject.org>
|
|
Date: Sun, 25 Aug 2019 06:57:36 +0000
|
|
Subject: [PATCH 1/2] SiFive Unleashed Ethernet
|
|
|
|
---
|
|
Documentation/devicetree/bindings/net/macb.txt | 4 ++--
|
|
arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts | 9 +++++++++
|
|
drivers/net/ethernet/cadence/macb_main.c | 2 +-
|
|
3 files changed, 12 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
|
|
index 63c73fa..0b61a90 100644
|
|
--- a/Documentation/devicetree/bindings/net/macb.txt
|
|
+++ b/Documentation/devicetree/bindings/net/macb.txt
|
|
@@ -15,10 +15,10 @@ Required properties:
|
|
Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
|
|
Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.
|
|
Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.
|
|
- Use "sifive,fu540-macb" for SiFive FU540-C000 SoC.
|
|
+ Use "sifive,fu540-c000-gem" for SiFive FU540-C000 SoC.
|
|
Or the generic form: "cdns,emac".
|
|
- reg: Address and length of the register set for the device
|
|
- For "sifive,fu540-macb", second range is required to specify the
|
|
+ For "sifive,fu540-c000-gem", second range is required to specify the
|
|
address and length of the registers for GEMGXL Management block.
|
|
- interrupts: Should contain macb interrupt
|
|
- phy-mode: See ethernet.txt file in the same directory.
|
|
diff --git a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
|
|
index 93d68cb..54fc701 100644
|
|
--- a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
|
|
+++ b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
|
|
@@ -85,3 +85,12 @@
|
|
reg = <0>;
|
|
};
|
|
};
|
|
+
|
|
+ð0 {
|
|
+ status = "okay";
|
|
+ phy-mode = "gmii";
|
|
+ phy-handle = <&phy1>;
|
|
+ phy1: ethernet-phy@0 {
|
|
+ reg = <0>;
|
|
+ };
|
|
+};
|
|
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
|
|
index 5ca17e6..35b59b5 100644
|
|
--- a/drivers/net/ethernet/cadence/macb_main.c
|
|
+++ b/drivers/net/ethernet/cadence/macb_main.c
|
|
@@ -4154,7 +4154,7 @@ static const struct of_device_id macb_dt_ids[] = {
|
|
{ .compatible = "cdns,emac", .data = &emac_config },
|
|
{ .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config},
|
|
{ .compatible = "cdns,zynq-gem", .data = &zynq_config },
|
|
- { .compatible = "sifive,fu540-macb", .data = &fu540_c000_config },
|
|
+ { .compatible = "sifive,fu540-c000-gem", .data = &fu540_c000_config },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, macb_dt_ids);
|
|
--
|
|
2.23.0
|
|
|