From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 13 Aug 2013 22:28:01 +0000 (-0700)
Subject: Merge tag 'usb-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=165f60642ae988f0b9dcfd4988806e7a938b26c7;p=deliverable%2Flinux.git

Merge tag 'usb-for-v3.12' of git://git./linux/kernel/git/balbi/usb into usb-next

Felipe writes:

usb: patches for v3.12 merge window

All patches here have been pending on linux-usb
and sitting in linux-next for a while now.

The biggest things in this tag are:

DWC3 learned proper usage of threaded IRQ
handlers and now we spend very little time
in hardirq context.

MUSB now has proper support for BeagleBone and
Beaglebone Black.

Tegra's USB support also got quite a bit of love
and is learning to use PHY layer and generic DT
attributes.

Other than that, the usual pack of cleanups and
non-critical fixes follow.

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

Conflicts:
	drivers/usb/gadget/udc-core.c
	drivers/usb/host/ehci-tegra.c
	drivers/usb/musb/omap2430.c
	drivers/usb/musb/tusb6010.c
---

165f60642ae988f0b9dcfd4988806e7a938b26c7
diff --cc drivers/usb/gadget/udc-core.c
index 13e25f80fc20,3122ab942f75..546bfda3059a
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@@ -105,6 -106,13 +106,13 @@@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_requ
  
  /* ------------------------------------------------------------------------- */
  
+ static void usb_gadget_state_work(struct work_struct *work)
+ {
+ 	struct usb_gadget	*gadget = work_to_gadget(work);
+ 
 -	sysfs_notify(&gadget->dev.kobj, NULL, "status");
++	sysfs_notify(&gadget->dev.kobj, NULL, "state");
+ }
+ 
  void usb_gadget_set_state(struct usb_gadget *gadget,
  		enum usb_device_state state)
  {
diff --cc drivers/usb/musb/omap2430.c
index f44e8b5e00c9,ebb46eca1791..59d2245db1c8
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@@ -481,8 -481,8 +481,8 @@@ static u64 omap2430_dmamask = DMA_BIT_M
  
  static int omap2430_probe(struct platform_device *pdev)
  {
 -	struct resource			musb_resources[2];
 +	struct resource			musb_resources[3];
- 	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;
+ 	struct musb_hdrc_platform_data	*pdata = dev_get_platdata(&pdev->dev);
  	struct omap_musb_board_data	*data;
  	struct platform_device		*musb;
  	struct omap2430_glue		*glue;
diff --cc drivers/usb/musb/tusb6010.c
index 6f8a9ca96ae7,0d68fc1d9f31..b3b3ed723882
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@@ -1156,8 -1156,8 +1156,8 @@@ static u64 tusb_dmamask = DMA_BIT_MASK(
  
  static int tusb_probe(struct platform_device *pdev)
  {
 -	struct resource musb_resources[2];
 +	struct resource musb_resources[3];
- 	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;
+ 	struct musb_hdrc_platform_data	*pdata = dev_get_platdata(&pdev->dev);
  	struct platform_device		*musb;
  	struct tusb6010_glue		*glue;
  
diff --cc drivers/usb/phy/Kconfig
index b57514ba486a,f41c3e12c6a7..d5589f9c60a9
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@@ -85,8 -78,8 +79,9 @@@ config OMAP_USB
  
  config OMAP_USB3
  	tristate "OMAP USB3 PHY Driver"
 +	depends on ARCH_OMAP2PLUS || COMPILE_TEST
  	select OMAP_CONTROL_USB
+ 	select USB_PHY
  	help
  	  Enable this to support the USB3 PHY that is part of SOC. This
  	  driver takes care of all the PHY functionality apart from comparator.