net: dsa: Allow DSA and CPU ports to have a phy-mode property

It can be useful for DSA and CPU ports to have a phy-mode property, in
particular to specify RGMII delays. Parse the property and set it in
the fixed-link phydev.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index afff17341b738033c51903e91aeaba4716f420be..76e3800765f881c554e93385c85f965cc96f611c 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -181,7 +181,7 @@ static int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct net_device *master)
        struct dsa_chip_data *cd = ds->pd;
        struct device_node *port_dn;
        struct phy_device *phydev;
-       int ret, port;
+       int ret, port, mode;
 
        for (port = 0; port < DSA_MAX_PORTS; port++) {
                if (!(dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)))
@@ -196,6 +196,12 @@ static int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct net_device *master)
                                return ret;
                        }
                        phydev = of_phy_find_device(port_dn);
+
+                       mode = of_get_phy_mode(port_dn);
+                       if (mode < 0)
+                               mode = PHY_INTERFACE_MODE_NA;
+                       phydev->interface = mode;
+
                        genphy_config_init(phydev);
                        genphy_read_status(phydev);
                        if (ds->drv->adjust_link)