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: Dinh Nguyen <dinguyen@altera.com>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt
index 1f62623f8c3f22ff1a25ee4ef56ceeb43e74e9e1..060bbf098ef3415be633a539b626977ebfcf4b47 100644 (file)
--- a/Documentation/devicetree/bindings/net/stmmac.txt
+++ b/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-<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

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 7d36163d0d23a851fc0fcdc14da0e1fb2359eda5..cd01ee7ecef19339c90765747a57b2d621765806 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/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);