Merge tag 'usb-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[sfrench/cifs-2.6.git] / drivers / net / ethernet / ti / cpsw.c

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 0e8f61a29479201ec157f1e1cdd97e76d0851cc4..a591583d120e1f598ab66f8d5e07daf15dc46321 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -26,6 +26,7 @@
 #include <linux/netdevice.h>
 #include <linux/net_tstamp.h>
 #include <linux/phy.h>
+#include <linux/phy/phy.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
 #include <linux/pm_runtime.h>
@@ -387,6 +388,7 @@ struct cpsw_slave_data {
        int             phy_if;
        u8              mac_addr[ETH_ALEN];
        u16             dual_emac_res_vlan;     /* Reserved VLAN for DualEMAC */
+       struct phy      *ifphy;
 };
 
 struct cpsw_platform_data {
@@ -1624,7 +1626,12 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv)
        phy_start(slave->phy);
 
        /* Configure GMII_SEL register */
-       cpsw_phy_sel(cpsw->dev, slave->phy->interface, slave->slave_num);
+       if (!IS_ERR(slave->data->ifphy))
+               phy_set_mode_ext(slave->data->ifphy, PHY_MODE_ETHERNET,
+                                slave->data->phy_if);
+       else
+               cpsw_phy_sel(cpsw->dev, slave->phy->interface,
+                            slave->slave_num);
 }
 
 static inline void cpsw_add_default_vlan(struct cpsw_priv *priv)
@@ -3274,6 +3281,16 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
                if (!of_node_name_eq(slave_node, "slave"))
                        continue;
 
+               slave_data->ifphy = devm_of_phy_get(&pdev->dev, slave_node,
+                                                   NULL);
+               if (!IS_ENABLED(CONFIG_TI_CPSW_PHY_SEL) &&
+                   IS_ERR(slave_data->ifphy)) {
+                       ret = PTR_ERR(slave_data->ifphy);
+                       dev_err(&pdev->dev,
+                               "%d: Error retrieving port phy: %d\n", i, ret);
+                       return ret;
+               }
+
                slave_data->phy_node = of_parse_phandle(slave_node,
                                                        "phy-handle", 0);
                parp = of_get_property(slave_node, "phy_id", &lenp);