Merge tag 'usb-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

Felipe writes:

usb: patches for v4.3 merge window

New support for Allwinne SoC on the MUSB driver has been added to the list of
glue layers. MUSB also got support for building all DMA engines in one binary;
this will be great for distros.

DWC3 now has no trace of dev_dbg()/dev_vdbg() usage. We will rely solely on
tracing to debug DWC3. There was also a fix for memory corruption with EP0 when
maxpacket size transfers are > 512 bytes.

Robert's EP capabilities flags is making EP selection a lot simpler. UDCs are
now required to set these flags up when adding endpoints to the framework.

Other than these, we have the usual set of miscelaneous cleanups and minor
fixes.

Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 3ad48e1c0c57..ab6212e888e1 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -560,6 +560,8 @@ static irqreturn_t ci_irq(int irq, void *data)
 static int ci_get_platdata(struct device *dev,
                 struct ci_hdrc_platform_data *platdata)
 {
+        int ret;
+
         if (!platdata->phy_mode)
                 platdata->phy_mode = of_usb_get_phy_mode(dev->of_node);
 
@@ -588,6 +590,19 @@ static int ci_get_platdata(struct device *dev,
                                 of_usb_host_tpl_support(dev->of_node);
         }
 
+        if (platdata->dr_mode == USB_DR_MODE_OTG) {
+                /* We can support HNP and SRP of OTG 2.0 */
+                platdata->ci_otg_caps.otg_rev = 0x0200;
+                platdata->ci_otg_caps.hnp_support = true;
+                platdata->ci_otg_caps.srp_support = true;
+
+                /* Update otg capabilities by DT properties */
+                ret = of_usb_update_otg_caps(dev->of_node,
+                                        &platdata->ci_otg_caps);
+                if (ret)
+                        return ret;
+        }
+
         if (of_usb_get_maximum_speed(dev->of_node) == USB_SPEED_FULL)
                 platdata->flags |= CI_HDRC_FORCE_FULLSPEED;