From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 24 Oct 2013 15:18:40 +0000 (+0100)
Subject: Merge tag 'usb-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5328f35b1584a9849ffe46afa42018946aa43851;p=linux-beck.git

Merge tag 'usb-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

Felipe writes:

usb: patches for v3.13

Final conversions to configfs for mass storage, acm_ms, and
multi gadgets.

MUSB should now work out of the box on AM335x-based boards
(beagle bone white and black) with DMA thanks to Sebastian's
work.

We can now enable VERBOSE_DEBUG on builds of drivers/usb/gadget/
by selecting CONFIG_USB_GADGET_VERBOSE.

s3c-hsotg got quite a few non-critical fixes but also learned
a few new tricks (isochronous transfers, multi count support).

The Marvel USB3 Controller driver got a memory leak fix.

devm_usb_get_phy() learned not to return NULL, ever.

Other than these patches, we have the usual set of cleanups
ranging from removal of unnecessary *_set_drvdata() to using
SIMPLE_DEV_PM_OPS.

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

5328f35b1584a9849ffe46afa42018946aa43851
diff --cc include/linux/usb/usb_phy_gen_xceiv.h
index 11d85b9c1b08,42f3b71a9775..cc8d818a83be
--- a/include/linux/usb/usb_phy_gen_xceiv.h
+++ b/include/linux/usb/usb_phy_gen_xceiv.h
@@@ -9,10 -9,11 +9,11 @@@ struct usb_phy_gen_xceiv_platform_data 
  
  	/* if set fails with -EPROBE_DEFER if can't get regulator */
  	unsigned int needs_vcc:1;
- 	unsigned int needs_reset:1;
+ 	unsigned int needs_reset:1;	/* deprecated */
+ 	int gpio_reset;
  };
  
 -#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)
 +#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
  /* sometimes transceivers are accessed only through e.g. ULPI */
  extern void usb_nop_xceiv_register(void);
  extern void usb_nop_xceiv_unregister(void);