Merge remote-tracking branch 'phy-next/next'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
index 0e8f61a29479201ec157f1e1cdd97e76d0851cc4,94e5e5b791ecbdfc69b7d381160f29128f0ac6e2..a591583d120e1f598ab66f8d5e07daf15dc46321
--- 1/drivers/net/ethernet/ti/cpsw.c
--- 2/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@@ -3271,9 -3151,19 +3278,19 @@@ static int cpsw_probe_dt(struct cpsw_pl
                const __be32 *parp;
  
                /* This is no slave child node, continue */
 -              if (strcmp(slave_node->name, "slave"))
 +              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);

diff --cc drivers/phy/qualcomm/phy-qcom-qusb2.c
index 6d4b44b569bc78e7f3548825ddf4522c183bbd7b,098d793a89883312920575c3a28204be1fc04d9f..9177989f22d129c1d976388dda448d7a79bacd98
--- 1/drivers/phy/qualcomm/phy-qcom-qusb2.c
--- 2/drivers/phy/qualcomm/phy-qcom-qusb2.c
+++ b/drivers/phy/qualcomm/phy-qcom-qusb2.c
@@@ -416,16 -415,16 +416,17 @@@ static void qusb2_phy_set_tune2_param(s
  
        /* Fused TUNE1/2 value is the higher nibble only */
        if (cfg->update_tune1_with_efuse)
 -              qusb2_setbits(qphy->base, cfg->regs[QUSB2PHY_PORT_TUNE1],
 -                            val[0] << 0x4);
 +              qusb2_write_mask(qphy->base, cfg->regs[QUSB2PHY_PORT_TUNE1],
 +                               val[0] << HSTX_TRIM_SHIFT,
 +                               HSTX_TRIM_MASK);
        else
 -              qusb2_setbits(qphy->base, cfg->regs[QUSB2PHY_PORT_TUNE2],
 -                            val[0] << 0x4);
 -
 +              qusb2_write_mask(qphy->base, cfg->regs[QUSB2PHY_PORT_TUNE2],
 +                               val[0] << HSTX_TRIM_SHIFT,
 +                               HSTX_TRIM_MASK);
  }
  
- static int qusb2_phy_set_mode(struct phy *phy, enum phy_mode mode)
+ static int qusb2_phy_set_mode(struct phy *phy,
+                             enum phy_mode mode, int submode)
  {
        struct qusb2_phy *qphy = phy_get_drvdata(phy);