|
@@ -521,10 +521,13 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
|
|
|
struct device_node *phy_dn, *port_dn;
|
|
|
bool phy_is_fixed = false;
|
|
|
u32 phy_flags = 0;
|
|
|
- int ret;
|
|
|
+ int mode, ret;
|
|
|
|
|
|
port_dn = cd->port_dn[p->port];
|
|
|
- p->phy_interface = of_get_phy_mode(port_dn);
|
|
|
+ mode = of_get_phy_mode(port_dn);
|
|
|
+ if (mode < 0)
|
|
|
+ mode = PHY_INTERFACE_MODE_NA;
|
|
|
+ p->phy_interface = mode;
|
|
|
|
|
|
phy_dn = of_parse_phandle(port_dn, "phy-handle", 0);
|
|
|
if (of_phy_is_fixed_link(port_dn)) {
|
|
@@ -559,6 +562,8 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p,
|
|
|
if (!p->phy)
|
|
|
return -ENODEV;
|
|
|
|
|
|
+ /* Use already configured phy mode */
|
|
|
+ p->phy_interface = p->phy->interface;
|
|
|
phy_connect_direct(slave_dev, p->phy, dsa_slave_adjust_link,
|
|
|
p->phy_interface);
|
|
|
} else {
|