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

Pull USB/PHY updates from Greg KH:
 "Here is the big set of USB and PHY driver patches for 5.2-rc1

  There is the usual set of:

   - USB gadget updates

   - PHY driver updates and additions

   - USB serial driver updates and fixes

   - typec updates and new chips supported

   - mtu3 driver updates

   - xhci driver updates

   - other tiny driver updates

  Nothing really interesting, just constant forward progress.

  All of these have been in linux-next for a while with no reported
  issues. The usb-gadget and usb-serial trees were merged a bit "late",
  but both of them had been in linux-next before they got merged here
  last Friday"

* tag 'usb-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (206 commits)
  USB: serial: f81232: implement break control
  USB: serial: f81232: add high baud rate support
  USB: serial: f81232: clear overrun flag
  USB: serial: f81232: fix interrupt worker not stop
  usb: dwc3: Rename DWC3_DCTL_LPM_ERRATA
  usb: dwc3: Fix default lpm_nyet_threshold value
  usb: dwc3: debug: Print GET_STATUS(device) tracepoint
  usb: dwc3: Do core validation early on probe
  usb: dwc3: gadget: Set lpm_capable
  usb: gadget: atmel: tie wake lock to running clock
  usb: gadget: atmel: support USB suspend
  usb: gadget: atmel_usba_udc: simplify setting of interrupt-enabled mask
  dwc2: gadget: Fix completed transfer size calculation in DDMA
  usb: dwc2: Set lpm mode parameters depend on HW configuration
  usb: dwc2: Fix channel disable flow
  usb: dwc2: Set actual frame number for completed ISOC transfer
  usb: gadget: do not use __constant_cpu_to_le16
  usb: dwc2: gadget: Increase descriptors count for ISOC's
  usb: introduce usb_ep_type_string() function
  usb: dwc3: move synchronize_irq() out of the spinlock protected block
  ...

1 files changed, 28 insertions, 2 deletions

diff --git a/drivers/phy/rockchip/phy-rockchip-emmc.c b/drivers/phy/rockchip/phy-rockchip-emmc.c
index 19bf84f0bc67..b804c6bf4b55 100644
--- a/drivers/phy/rockchip/phy-rockchip-emmc.c
+++ b/drivers/phy/rockchip/phy-rockchip-emmc.c
@@ -87,6 +87,7 @@ struct rockchip_emmc_phy {
         unsigned int    reg_offset;
         struct regmap   *reg_base;
         struct clk      *emmcclk;
+        unsigned int drive_impedance;
 };
 
 static int rockchip_emmc_phy_power(struct phy *phy, bool on_off)
@@ -281,10 +282,10 @@ static int rockchip_emmc_phy_power_on(struct phy *phy)
 {
         struct rockchip_emmc_phy *rk_phy = phy_get_drvdata(phy);
 
-        /* Drive impedance: 50 Ohm */
+        /* Drive impedance: from DTS */
         regmap_write(rk_phy->reg_base,
                      rk_phy->reg_offset + GRF_EMMCPHY_CON6,
-                     HIWORD_UPDATE(PHYCTRL_DR_50OHM,
+                     HIWORD_UPDATE(rk_phy->drive_impedance,
                                    PHYCTRL_DR_MASK,
                                    PHYCTRL_DR_SHIFT));
 
@@ -314,6 +315,26 @@ static const struct phy_ops ops = {
         .owner          = THIS_MODULE,
 };
 
+static u32 convert_drive_impedance_ohm(struct platform_device *pdev, u32 dr_ohm)
+{
+        switch (dr_ohm) {
+        case 100:
+                return PHYCTRL_DR_100OHM;
+        case 66:
+                return PHYCTRL_DR_66OHM;
+        case 50:
+                return PHYCTRL_DR_50OHM;
+        case 40:
+                return PHYCTRL_DR_40OHM;
+        case 33:
+                return PHYCTRL_DR_33OHM;
+        }
+
+        dev_warn(&pdev->dev, "Invalid value %u for drive-impedance-ohm.\n",
+                 dr_ohm);
+        return PHYCTRL_DR_50OHM;
+}
+
 static int rockchip_emmc_phy_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
@@ -322,6 +343,7 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev)
         struct phy_provider *phy_provider;
         struct regmap *grf;
         unsigned int reg_offset;
+        u32 val;
 
         if (!dev->parent || !dev->parent->of_node)
                 return -ENODEV;
@@ -344,6 +366,10 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev)
 
         rk_phy->reg_offset = reg_offset;
         rk_phy->reg_base = grf;
+        rk_phy->drive_impedance = PHYCTRL_DR_50OHM;
+
+        if (!of_property_read_u32(dev->of_node, "drive-impedance-ohm", &val))
+                rk_phy->drive_impedance = convert_drive_impedance_ohm(pdev, val);
 
         generic_phy = devm_phy_create(dev, dev->of_node, &ops);
         if (IS_ERR(generic_phy)) {