d2a2eb7e48
This driver has been cherry-picked and backported from the following LKML thread: *https://lkml.org/lkml/2015/5/26/744 It also updates the DT accordingly. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> SVN-Revision: 45831
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
From 3a95f75867be562cb919ff23a738f70357188fbd Mon Sep 17 00:00:00 2001
|
|
From: Mathieu Olivari <mathieu@codeaurora.org>
|
|
Date: Fri, 8 May 2015 16:02:03 -0700
|
|
Subject: [PATCH 3/8] stmmac: add fixed-link device-tree support
|
|
|
|
In case DT is used, this change adds the ability to the stmmac driver to
|
|
detect a fixed-link PHY, instanciate it, and use it during
|
|
phy_connect().
|
|
|
|
Fixed link PHYs DT usage is described in:
|
|
Documentation/devicetree/bindings/net/fixed-link.txt
|
|
|
|
Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
|
|
---
|
|
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
|
|
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 12 +++++++++++-
|
|
2 files changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
|
@@ -858,7 +858,7 @@ static int stmmac_init_phy(struct net_de
|
|
* device as well.
|
|
* Note: phydev->phy_id is the result of reading the UID PHY registers.
|
|
*/
|
|
- if (phydev->phy_id == 0) {
|
|
+ if (!priv->plat->phy_node && phydev->phy_id == 0) {
|
|
phy_disconnect(phydev);
|
|
return -ENODEV;
|
|
}
|
|
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
|
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
|
|
@@ -164,6 +164,14 @@ static int stmmac_probe_config_dt(struct
|
|
/* If we find a phy-handle property, use it as the PHY */
|
|
plat->phy_node = of_parse_phandle(np, "phy-handle", 0);
|
|
|
|
+ /* If phy-handle is not specified, check if we have a fixed-phy */
|
|
+ if (!plat->phy_node && of_phy_is_fixed_link(np)) {
|
|
+ if ((of_phy_register_fixed_link(np) < 0))
|
|
+ return -ENODEV;
|
|
+
|
|
+ plat->phy_node = of_node_get(np);
|
|
+ }
|
|
+
|
|
/* "snps,phy-addr" is not a standard property. Mark it as deprecated
|
|
* and warn of its use. Remove this when phy node support is added.
|
|
*/
|
|
@@ -226,7 +234,7 @@ static int stmmac_probe_config_dt(struct
|
|
GFP_KERNEL);
|
|
if (!dma_cfg) {
|
|
ret = -ENOMEM;
|
|
- goto err;
|
|
+ goto err2;
|
|
}
|
|
plat->dma_cfg = dma_cfg;
|
|
of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
|
|
@@ -243,6 +251,8 @@ static int stmmac_probe_config_dt(struct
|
|
|
|
return 0;
|
|
|
|
+err2:
|
|
+ of_node_put(np);
|
|
err:
|
|
return ret;
|
|
}
|