From dbbf6221d0e9d6efde985738a5ccec1a6450f7f0 Mon Sep 17 00:00:00 2001 From: Dinh Nguyen Date: Wed, 18 Jul 2012 13:28:26 +0000 Subject: [PATCH] --- yaml --- r: 315503 b: refs/heads/master c: 84c9f8c41df9f62a34eb680009b59cc817a76d6e h: refs/heads/master i: 315501: 0b687f1b5b66feeaeeb4629927d30ddf44ecda62 315499: 7b4ed47aa3bfd4a4ee1ea5871efb3b1fc8769ea5 315495: 31526ff8850bfc79b9b081dba00b9bc6ddd16031 315487: c6c313b998d59a6b59602c4a93ba63e9795efe7f v: v3 --- [refs] | 2 +- trunk/Documentation/devicetree/bindings/net/stmmac.txt | 3 ++- .../drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 145bb5241c3d..de070df67836 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d962ecf1e8d42c09abac2f715239a592c9415de +refs/heads/master: 84c9f8c41df9f62a34eb680009b59cc817a76d6e diff --git a/trunk/Documentation/devicetree/bindings/net/stmmac.txt b/trunk/Documentation/devicetree/bindings/net/stmmac.txt index 1f62623f8c3f..060bbf098ef3 100644 --- a/trunk/Documentation/devicetree/bindings/net/stmmac.txt +++ b/trunk/Documentation/devicetree/bindings/net/stmmac.txt @@ -1,7 +1,8 @@ * STMicroelectronics 10/100/1000 Ethernet driver (GMAC) Required properties: -- compatible: Should be "st,spear600-gmac" +- compatible: Should be "snps,dwmac-" "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 diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 7d36163d0d23..cd01ee7ecef1 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -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);