Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84c9f8c4 authored by Dinh Nguyen's avatar Dinh Nguyen Committed by David S. Miller
Browse files

net: stmmac: Add ip version to dts bindings 



Because there are multiple variants to the stmmac/dwmac driver, the
dts bindings should be updated to include version of the IP used.

Signed-off-by: default avatarDinh Nguyen <dinguyen@altera.com>
Acked-by: default avatarStefan Roese <sr@denx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d962ecf

Documentation/devicetree/bindings/net/stmmac.txt

+2 −1
Original line number Diff line number Diff line 
* STMicroelectronics 10/100/1000 Ethernet driver (GMAC)



Required properties:

- compatible: Should be "st,spear600-gmac"

- compatible: Should be "snps,dwmac-<ip_version>" "snps,dwmac"

	For backwards compatibility: "st,spear600-gmac" is also supported.

- reg: Address and length of the register set for the device

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device

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

+6 −2
Original line number Diff line number Diff line
@@ -49,7 +49,9 @@ static int __devinit stmmac_probe_config_dt(struct platform_device *pdev, 
	 * are provided. All other properties should be added

	 * once needed on other platforms.

	 */

	if (of_device_is_compatible(np, "st,spear600-gmac")) {

	if (of_device_is_compatible(np, "st,spear600-gmac") ||

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

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

		plat->has_gmac = 1;

		plat->pmt = 1;

	}
@@ -252,7 +254,9 @@ static const struct dev_pm_ops stmmac_pltfr_pm_ops; 
#endif /* CONFIG_PM */



static const struct of_device_id stmmac_dt_ids[] = {

	{ .compatible = "st,spear600-gmac", },

	{ .compatible = "st,spear600-gmac"},

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

	{ .compatible = "snps,dwmac"},

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(of, stmmac_dt_ids);