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

Pull USB patches from Greg KH:
 "Here's the big USB pull request for 3.15-rc1.

  The normal set of patches, lots of controller driver updates, and a
  smattering of individual USB driver updates as well.

  All have been in linux-next for a while"

* tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (249 commits)
  xhci: Transition maintainership to Mathias Nyman.
  USB: disable reset-resume when USB_QUIRK_RESET is set
  USB: unbind all interfaces before rebinding any
  usb: phy: Add ulpi IDs for SMSC USB3320 and TI TUSB1210
  usb: gadget: tcm_usb_gadget: stop format strings
  usb: gadget: f_fs: add missing spinlock and mutex unlock
  usb: gadget: composite: switch over to ERR_CAST()
  usb: gadget: inode: switch over to memdup_user()
  usb: gadget: f_subset: switch over to PTR_RET
  usb: gadget: lpc32xx_udc: fix wrong clk_put() sequence
  USB: keyspan: remove dead debugging code
  USB: serial: add missing newlines to dev_<level> messages.
  USB: serial: add missing braces
  USB: serial: continue to write on errors
  USB: serial: continue to read on errors
  USB: serial: make bulk_out_size a lower limit
  USB: cypress_m8: fix potential scheduling while atomic
  devicetree: bindings: document lsi,zevio-usb
  usb: chipidea: add support for USB OTG controller on LSI Zevio SoCs
  usb: chipidea: imx: Use dev_name() for ci_hdrc name to distinguish USBs
  ...

1 files changed, 0 insertions, 9 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 364d204298fa..1399383315a3 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -347,7 +347,6 @@ config CPU_SUBTYPE_SH7720
         select CPU_HAS_DSP
         select SYS_SUPPORTS_SH_CMT
         select ARCH_WANT_OPTIONAL_GPIOLIB
-        select USB_ARCH_HAS_OHCI
         select USB_OHCI_SH if USB_OHCI_HCD
         select PINCTRL
         help
@@ -358,7 +357,6 @@ config CPU_SUBTYPE_SH7721
         select CPU_SH3
         select CPU_HAS_DSP
         select SYS_SUPPORTS_SH_CMT
-        select USB_ARCH_HAS_OHCI
         select USB_OHCI_SH if USB_OHCI_HCD
         help
           Select SH7721 if you have a SH3-DSP SH7721 CPU.
@@ -436,8 +434,6 @@ config CPU_SUBTYPE_SH7734
         select CPU_SH4A
         select CPU_SHX2
         select ARCH_WANT_OPTIONAL_GPIOLIB
-        select USB_ARCH_HAS_OHCI
-        select USB_ARCH_HAS_EHCI
         select PINCTRL
         help
           Select SH7734 if you have a SH4A SH7734 CPU.
@@ -447,8 +443,6 @@ config CPU_SUBTYPE_SH7757
         select CPU_SH4A
         select CPU_SHX2
         select ARCH_WANT_OPTIONAL_GPIOLIB
-        select USB_ARCH_HAS_OHCI
-        select USB_ARCH_HAS_EHCI
         select PINCTRL
         help
           Select SH7757 if you have a SH4A SH7757 CPU.
@@ -456,7 +450,6 @@ config CPU_SUBTYPE_SH7757
 config CPU_SUBTYPE_SH7763
         bool "Support SH7763 processor"
         select CPU_SH4A
-        select USB_ARCH_HAS_OHCI
         select USB_OHCI_SH if USB_OHCI_HCD
         help
           Select SH7763 if you have a SH4A SH7763(R5S77631) CPU.
@@ -485,9 +478,7 @@ config CPU_SUBTYPE_SH7786
         select CPU_HAS_PTEAEX
         select GENERIC_CLOCKEVENTS_BROADCAST if SMP
         select ARCH_WANT_OPTIONAL_GPIOLIB
-        select USB_ARCH_HAS_OHCI
         select USB_OHCI_SH if USB_OHCI_HCD
-        select USB_ARCH_HAS_EHCI
         select USB_EHCI_SH if USB_EHCI_HCD
         select PINCTRL