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

Pull USB 3.5-rc1 changes from Greg Kroah-Hartman:
 "Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window.

  It's touches a lot of different parts of the kernel, all USB drivers,
  due to some API cleanups (getting rid of the ancient err() macro) and
  some changes that are needed for USB 3.0 power management updates.

  There are also lots of new drivers, pimarily gadget, but others as
  well.  We deleted a staging driver, which was nice, and finally
  dropped the obsolete usbfs code, which will make Al happy to never
  have to touch that again.

  There were some build errors in the tree that linux-next found a few
  days ago, but those were fixed by the most recent changes (all were
  due to us not building with CONFIG_PM disabled.)

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

* tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits)
  xhci: Fix DIV_ROUND_UP compile error.
  xhci: Fix compile with CONFIG_USB_SUSPEND=n
  USB: Fix core compile with CONFIG_USB_SUSPEND=n
  brcm80211: Fix compile error for .disable_hub_initiated_lpm.
  Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
  MAINTAINERS: Add myself as maintainer to the USB PHY Layer
  USB: EHCI: fix command register configuration lost problem
  USB: Remove races in devio.c
  USB: ehci-platform: remove update_device
  USB: Disable hub-initiated LPM for comms devices.
  xhci: Add Intel U1/U2 timeout policy.
  xhci: Add infrastructure for host-specific LPM policies.
  USB: Add macros for interrupt endpoint types.
  xhci: Reserve one command for USB3 LPM disable.
  xhci: Some Evaluate Context commands must succeed.
  USB: Disable USB 3.0 LPM in critical sections.
  USB: Add support to enable/disable USB3 link states.
  USB: Allow drivers to disable hub-initiated LPM.
  USB: Calculate USB 3.0 exit latencies for LPM.
  USB: Refactor code to set LPM support flag.
  ...

Conflicts:
	arch/arm/mach-exynos/mach-nuri.c
	arch/arm/mach-exynos/mach-universal_c210.c
	drivers/net/wireless/ath/ath6kl/usb.c

1 files changed, 14 insertions, 54 deletions

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 569b33e754ba..bddc8fd9a7be 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -123,13 +123,7 @@ config USB_GADGET_STORAGE_NUM_BUFFERS
 #   - discrete ones (including all PCI-only controllers)
 #   - debug/dummy gadget+hcd is last.
 #
-choice
-        prompt "USB Peripheral Controller"
-        help
-           A USB device uses a controller to talk to its host.
-           Systems should have only one such upstream link.
-           Many controller drivers are platform-specific; these
-           often need board-specific hooks.
+menu "USB Peripheral Controller"
 
 #
 # Integrated controllers
@@ -147,6 +141,17 @@ config USB_AT91
            dynamically linked module called "at91_udc" and force all
            gadget drivers to also be dynamically linked.
 
+config USB_LPC32XX
+        tristate "LPC32XX USB Peripheral Controller"
+        depends on ARCH_LPC32XX
+        select USB_ISP1301
+        help
+           This option selects the USB device controller in the LPC32xx SoC.
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "lpc32xx_udc" and force all
+           gadget drivers to also be dynamically linked.
+
 config USB_ATMEL_USBA
         tristate "Atmel USBA"
         select USB_GADGET_DUALSPEED
@@ -161,7 +166,7 @@ config USB_FSL_USB2
         select USB_GADGET_DUALSPEED
         select USB_FSL_MPH_DR_OF if OF
         help
-           Some of Freescale PowerPC processors have a High Speed
+           Some of Freescale PowerPC and i.MX processors have a High Speed
            Dual-Role(DR) USB controller, which supports device mode.
 
            The number of programmable endpoints is different through
@@ -373,18 +378,6 @@ config USB_FSL_QE
            Set CONFIG_USB_GADGET to "m" to build this driver as a
            dynamically linked module called "fsl_qe_udc".
 
-config USB_CI13XXX_PCI
-        tristate "MIPS USB CI13xxx PCI UDC"
-        depends on PCI
-        select USB_GADGET_DUALSPEED
-        help
-          MIPS USB IP core family device controller
-          Currently it only supports IP part number CI13412
-
-          Say "y" to link the driver statically, or "m" to build a
-          dynamically linked module called "ci13xxx_udc" and force all
-          gadget drivers to also be dynamically linked.
-
 config USB_NET2272
         tristate "PLX NET2272"
         select USB_GADGET_DUALSPEED
@@ -438,22 +431,6 @@ config USB_GOKU
            dynamically linked module called "goku_udc" and to force all
            gadget drivers to also be dynamically linked.
 
-config USB_LANGWELL
-        tristate "Intel Langwell USB Device Controller"
-        depends on PCI
-        depends on !PHYS_ADDR_T_64BIT
-        select USB_GADGET_DUALSPEED
-        help
-           Intel Langwell USB Device Controller is a High-Speed USB
-           On-The-Go device controller.
-
-           The number of programmable endpoints is different through
-           controller revision.
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "langwell_udc" and force all
-           gadget drivers to also be dynamically linked.
-
 config USB_EG20T
         tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
         depends on PCI
@@ -477,23 +454,6 @@ config USB_EG20T
           ML7213/ML7831 is companion chip for Intel Atom E6xx series.
           ML7213/ML7831 is completely compatible for Intel EG20T PCH.
 
-config USB_CI13XXX_MSM
-        tristate "MIPS USB CI13xxx for MSM"
-        depends on ARCH_MSM
-        select USB_GADGET_DUALSPEED
-        select USB_MSM_OTG
-        help
-          MSM SoC has chipidea USB controller.  This driver uses
-          ci13xxx_udc core.
-          This driver depends on OTG driver for PHY initialization,
-          clock management, powering up VBUS, and power management.
-          This driver is not supported on boards like trout which
-          has an external PHY.
-
-          Say "y" to link the driver statically, or "m" to build a
-          dynamically linked module called "ci13xxx_msm" and force all
-          gadget drivers to also be dynamically linked.
-
 #
 # LAST -- dummy/emulated controller
 #
@@ -525,7 +485,7 @@ config USB_DUMMY_HCD
 # NOTE:  Please keep dummy_hcd LAST so that "real hardware" appears
 # first and will be selected by default.
 
-endchoice
+endmenu
 
 # Selected by UDC drivers that support high-speed operation.
 config USB_GADGET_DUALSPEED