Commit 2eed7209 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'add-support-for-synopsis-designware-version-3-72a' 

Lothar Rubusch says:

====================
Add support for Synopsis DesignWare version 3.72a

Add compatibility and dt-binding for Synopsis DesignWare version 3.72a.
The dwmac is used on some older Altera/Intel SoCs such as Arria10.
Updating compatibles in the driver and bindings for the DT improves the
binding check coverage for such SoCs.
====================

Link: https://patch.msgid.link/20241102114122.4631-1-l.rubusch@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7a4ea5da 8bed8923

Documentation/devicetree/bindings/net/snps,dwmac.yaml

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ select: 
          - snps,dwmac-3.610

          - snps,dwmac-3.70a

          - snps,dwmac-3.710

          - snps,dwmac-3.72a

          - snps,dwmac-4.00

          - snps,dwmac-4.10a

          - snps,dwmac-4.20a
@@ -90,6 +91,7 @@ properties: 
        - snps,dwmac-3.610

        - snps,dwmac-3.70a

        - snps,dwmac-3.710

        - snps,dwmac-3.72a

        - snps,dwmac-4.00

        - snps,dwmac-4.10a

        - snps,dwmac-4.20a

drivers/net/ethernet/stmicro/stmmac/dwmac-generic.c

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ static const struct of_device_id dwmac_generic_match[] = { 
	{ .compatible = "snps,dwmac-3.610"},

	{ .compatible = "snps,dwmac-3.70a"},

	{ .compatible = "snps,dwmac-3.710"},

	{ .compatible = "snps,dwmac-3.72a"},

	{ .compatible = "snps,dwmac-4.00"},

	{ .compatible = "snps,dwmac-4.10a"},

	{ .compatible = "snps,dwmac"},

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+1 −0
Original line number Diff line number Diff line
@@ -522,6 +522,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) 
	if (of_device_is_compatible(np, "st,spear600-gmac") ||

		of_device_is_compatible(np, "snps,dwmac-3.50a") ||

		of_device_is_compatible(np, "snps,dwmac-3.70a") ||

		of_device_is_compatible(np, "snps,dwmac-3.72a") ||

		of_device_is_compatible(np, "snps,dwmac")) {

		/* Note that the max-frame-size parameter as defined in the

		 * ePAPR v1.1 spec is defined as max-frame-size, it's