lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: stmmac: Add ip version to dts bindings

Browse Source 
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>
This commit is contained in:
Dinh Nguyen
2012-07-18 13:28:26 +00:00
committed by David S. Miller
parent 1d962ecf1e
commit 84c9f8c41d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/devicetree/bindings/net/stmmac.txt
View File

@@ -1,7 +1,8 @@
* STMicroelectronics 10/100/1000 Ethernet driver (GMAC) * STMicroelectronics 10/100/1000 Ethernet driver (GMAC)
Required properties: 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 - reg: Address and length of the register set for the device
- interrupt-parent: Should be the phandle for the interrupt controller - interrupt-parent: Should be the phandle for the interrupt controller
that services interrupts for this device that services interrupts for this device

8
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
View File

@@ -49,7 +49,9 @@ static int __devinit stmmac_probe_config_dt(struct platform_device *pdev,
* are provided. All other properties should be added * are provided. All other properties should be added
* once needed on other platforms. * 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->has_gmac = 1;
plat->pmt = 1; plat->pmt = 1;
} }
@@ -252,7 +254,9 @@ static const struct dev_pm_ops stmmac_pltfr_pm_ops;
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static const struct of_device_id stmmac_dt_ids[] = { 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 */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, stmmac_dt_ids); MODULE_DEVICE_TABLE(of, stmmac_dt_ids);