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

Pull USB patches from Greg Kroah-Hartman:
 "Here's the big USB patch set for the 3.6-rc1 merge window.

  Lots of little changes in here, primarily for gadget controllers and
  drivers.  There's some scsi changes that I think also went in through
  the scsi tree, but they merge just fine.  All of these patches have
  been in the linux-next tree for a while now.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fix up trivial conflicts in include/scsi/scsi_device.h (same libata
conflict that Jeff had already encountered)

* tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (207 commits)
  usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams
  usb: Add quirk detection based on interface information
  usb: s3c-hsotg: Add header file protection macros in s3c-hsotg.h
  USB: ehci-s5p: Add vbus setup function to the s5p ehci glue layer
  USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
  USB: notify phy when root hub port connect change
  USB: remove 8 bytes of padding from usb_host_interface on 64 bit builds
  USB: option: add ZTE MF821D
  USB: sierra: QMI mode MC7710 moved to qcserial
  USB: qcserial: adding Sierra Wireless devices
  USB: qcserial: support generic Qualcomm serial ports
  USB: qcserial: make probe more flexible
  USB: qcserial: centralize probe exit path
  USB: qcserial: consolidate usb_set_interface calls
  USB: ehci-s5p: Add support for device tree
  USB: ohci-exynos: Add support for device tree
  USB: ehci-omap: fix compile failure(v1)
  usb: host: tegra: pass correct pointer in ehci_setup()
  USB: ehci-fsl: Update ifdef check to work on 64-bit ppc
  USB: serial: keyspan: Removed unrequired parentheses.
  ...

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/host/fhci-hub.c b/drivers/usb/host/fhci-hub.c
index 348fe62e94f7..6af2512f8378 100644
--- a/drivers/usb/host/fhci-hub.c
+++ b/drivers/usb/host/fhci-hub.c
@@ -97,7 +97,7 @@ void fhci_port_disable(struct fhci_hcd *fhci)
 
         /* Enable IDLE since we want to know if something comes along */
         usb->saved_msk |= USB_E_IDLE_MASK;
-        out_be16(&usb->fhci->regs->usb_mask, usb->saved_msk);
+        out_be16(&usb->fhci->regs->usb_usbmr, usb->saved_msk);
 
         /* check if during the disconnection process attached new device */
         if (port_status == FHCI_PORT_WAITING)
@@ -158,21 +158,21 @@ void fhci_port_reset(void *lld)
 
         fhci_stop_sof_timer(fhci);
         /* disable the USB controller */
-        mode = in_8(&fhci->regs->usb_mod);
-        out_8(&fhci->regs->usb_mod, mode & (~USB_MODE_EN));
+        mode = in_8(&fhci->regs->usb_usmod);
+        out_8(&fhci->regs->usb_usmod, mode & (~USB_MODE_EN));
 
         /* disable idle interrupts */
-        mask = in_be16(&fhci->regs->usb_mask);
-        out_be16(&fhci->regs->usb_mask, mask & (~USB_E_IDLE_MASK));
+        mask = in_be16(&fhci->regs->usb_usbmr);
+        out_be16(&fhci->regs->usb_usbmr, mask & (~USB_E_IDLE_MASK));
 
         fhci_io_port_generate_reset(fhci);
 
         /* enable interrupt on this endpoint */
-        out_be16(&fhci->regs->usb_mask, mask);
+        out_be16(&fhci->regs->usb_usbmr, mask);
 
         /* enable the USB controller */
-        mode = in_8(&fhci->regs->usb_mod);
-        out_8(&fhci->regs->usb_mod, mode | USB_MODE_EN);
+        mode = in_8(&fhci->regs->usb_usmod);
+        out_8(&fhci->regs->usb_usmod, mode | USB_MODE_EN);
         fhci_start_sof_timer(fhci);
 
         fhci_dbg(fhci, "<- %s\n", __func__);