Merge tag 'usb-for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Jul 2018 08:21:14 +0000 (10:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Jul 2018 08:21:14 +0000 (10:21 +0200)
Felipe writes:

usb: changes for v4.19

Not a big pull request with only 37 non-merge commits, most of which
are touching dwc2 (74% of the changes).

The most important changes are dwc2's support for uframe scheduling
and its endian-agnostic readl/writel wrappers.

From dwc3 side we have a special new glue layer for Synopsys HAPS
which will help Synopsys running FPGA validation using our upstream
driver. We also have the beginnings of dual-role support for Intel
Merrifield platform.

Apart from these, just a series of non-critical changes.

1  2 
MAINTAINERS
drivers/usb/dwc2/gadget.c
drivers/usb/dwc2/hcd.c
drivers/usb/dwc2/hcd_intr.c

diff --cc MAINTAINERS
Simple merge
index cefc99ae69b2f489c8fa16f9fca4381ffb405bc3,887bea99dce8e1ae3cc615063e8fcd81add437e5..220c0f9b89b0ba38fec14f088a789887425283a6
@@@ -3430,10 -3419,10 +3419,10 @@@ static void dwc2_gadget_handle_incomple
        for (idx = 1; idx < hsotg->num_of_eps; idx++) {
                hs_ep = hsotg->eps_in[idx];
                /* Proceed only unmasked ISOC EPs */
 -              if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))
 +              if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)
                        continue;
  
-               epctrl = dwc2_readl(hsotg->regs + DIEPCTL(idx));
+               epctrl = dwc2_readl(hsotg, DIEPCTL(idx));
                if ((epctrl & DXEPCTL_EPENA) &&
                    dwc2_gadget_target_frame_elapsed(hs_ep)) {
                        epctrl |= DXEPCTL_SNAK;
@@@ -3476,10 -3465,10 +3465,10 @@@ static void dwc2_gadget_handle_incomple
        for (idx = 1; idx < hsotg->num_of_eps; idx++) {
                hs_ep = hsotg->eps_out[idx];
                /* Proceed only unmasked ISOC EPs */
 -              if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))
 +              if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)
                        continue;
  
-               epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));
+               epctrl = dwc2_readl(hsotg, DOEPCTL(idx));
                if ((epctrl & DXEPCTL_EPENA) &&
                    dwc2_gadget_target_frame_elapsed(hs_ep)) {
                        /* Unmask GOUTNAKEFF interrupt */
@@@ -3650,10 -3639,10 +3639,10 @@@ irq_retry
                for (idx = 1; idx < hsotg->num_of_eps; idx++) {
                        hs_ep = hsotg->eps_out[idx];
                        /* Proceed only unmasked ISOC EPs */
 -                      if (!hs_ep->isochronous || (BIT(idx) & ~daintmsk))
 +                      if ((BIT(idx) & ~daintmsk) || !hs_ep->isochronous)
                                continue;
  
-                       epctrl = dwc2_readl(hsotg->regs + DOEPCTL(idx));
+                       epctrl = dwc2_readl(hsotg, DOEPCTL(idx));
  
                        if (epctrl & DXEPCTL_EPENA) {
                                epctrl |= DXEPCTL_SNAK;
Simple merge
Simple merge