Merge branch 'macb-Update-ethernet-compatible-string-for-SiFive-FU540'
Yash Shah says: ==================== macb: Update ethernet compatible string for SiFive FU540 This patch series renames the compatible property to a more appropriate string. The patchset is based on Linux-5.3-rc6 and tested on SiFive Unleashed board Change history: Since v1: - Dropped PATCH3 because it's already merged - Change the reference url in the patch descriptions to point to a 'lore.kernel.org' link instead of 'lkml.org' ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
2965daa334
|
@ -15,10 +15,10 @@ Required properties:
|
||||||
Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
|
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,zynq-gem" Xilinx Zynq-7xxx SoC.
|
||||||
Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.
|
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".
|
Or the generic form: "cdns,emac".
|
||||||
- reg: Address and length of the register set for the device
|
- 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.
|
address and length of the registers for GEMGXL Management block.
|
||||||
- interrupts: Should contain macb interrupt
|
- interrupts: Should contain macb interrupt
|
||||||
- phy-mode: See ethernet.txt file in the same directory.
|
- phy-mode: See ethernet.txt file in the same directory.
|
||||||
|
|
|
@ -4154,7 +4154,7 @@ static const struct of_device_id macb_dt_ids[] = {
|
||||||
{ .compatible = "cdns,emac", .data = &emac_config },
|
{ .compatible = "cdns,emac", .data = &emac_config },
|
||||||
{ .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config},
|
{ .compatible = "cdns,zynqmp-gem", .data = &zynqmp_config},
|
||||||
{ .compatible = "cdns,zynq-gem", .data = &zynq_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 */ }
|
{ /* sentinel */ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, macb_dt_ids);
|
MODULE_DEVICE_TABLE(of, macb_dt_ids);
|
||||||
|
|
Loading…
Reference in a new issue