1 From 3a95f75867be562cb919ff23a738f70357188fbd Mon Sep 17 00:00:00 2001
2 From: Mathieu Olivari <mathieu@codeaurora.org>
3 Date: Fri, 8 May 2015 16:02:03 -0700
4 Subject: [PATCH 3/8] stmmac: add fixed-link device-tree support
6 In case DT is used, this change adds the ability to the stmmac driver to
7 detect a fixed-link PHY, instanciate it, and use it during
10 Fixed link PHYs DT usage is described in:
11 Documentation/devicetree/bindings/net/fixed-link.txt
13 Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
15 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
16 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 12 +++++++++++-
17 2 files changed, 12 insertions(+), 2 deletions(-)
19 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
20 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
21 @@ -859,7 +859,7 @@ static int stmmac_init_phy(struct net_de
23 * Note: phydev->phy_id is the result of reading the UID PHY registers.
25 - if (phydev->phy_id == 0) {
26 + if (!priv->plat->phy_node && phydev->phy_id == 0) {
27 phy_disconnect(phydev);
30 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
31 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
32 @@ -177,6 +177,14 @@ static int stmmac_probe_config_dt(struct
33 /* If we find a phy-handle property, use it as the PHY */
34 plat->phy_node = of_parse_phandle(np, "phy-handle", 0);
36 + /* If phy-handle is not specified, check if we have a fixed-phy */
37 + if (!plat->phy_node && of_phy_is_fixed_link(np)) {
38 + if ((of_phy_register_fixed_link(np) < 0))
41 + plat->phy_node = of_node_get(np);
44 /* "snps,phy-addr" is not a standard property. Mark it as deprecated
45 * and warn of its use. Remove this when phy node support is added.
47 @@ -243,7 +251,7 @@ static int stmmac_probe_config_dt(struct
54 plat->dma_cfg = dma_cfg;
55 of_property_read_u32(np, "snps,pbl", &dma_cfg->pbl);
56 @@ -263,6 +271,8 @@ static int stmmac_probe_config_dt(struct