From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 25 Nov 2014 17:31:14 +0000 (-0800)
Subject: Merge tag 'usb-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... 
X-Git-Tag: firefly_0821_release~176^2~2679^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2d4d9f35bab1cad7f83d10864291d1e50b12c3f9;p=firefly-linux-kernel-4.4.55.git

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

Felipe writes:

usb: patches for v3.19 merge window

This time, a very pull request with 216 non-merge
commits. Most of the commits contained here are
sparse or coccinelle fixes ranging from missing
'static' to returning 0 in case of errors.

More importantly, we have the removal the now
unnecessary 'driver' argument to ->udc_stop().

DWC2 learned about Dual-Role builds. Users of
this IP can now have a single driver built for
host and device roles.

DWC3 got support for two new HW platforms: Exynos7
and AMD.

The Broadcom USB 3.0 Device Controller IP is now
supported and so is PLX USB338x, which means DWC3
has lost is badge as the only USB 3.0 peripheral
IP supported on Linux.

Thanks for Tony Lindgren's work, we can now have
a distro-like kernel where all MUSB glue layers
can be built into the same kernel (statically
or dynamically linked) and it'll work in PIO (DMA
will come probably on v3.20).

Other than these, the usual set of cleanups and
non-critical fixes.

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

2d4d9f35bab1cad7f83d10864291d1e50b12c3f9
diff --cc drivers/phy/phy-omap-usb2.c
index f091576b6449,32c3e86b4935..08f2da270837
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@@ -255,16 -251,13 +251,16 @@@ static int omap_usb2_probe(struct platf
  		otg->set_vbus		= omap_usb_set_vbus;
  	if (phy_data->flags & OMAP_USB2_HAS_START_SRP)
  		otg->start_srp		= omap_usb_start_srp;
- 	otg->phy		= &phy->phy;
+ 	otg->usb_phy		= &phy->phy;
  
  	platform_set_drvdata(pdev, phy);
 +	pm_runtime_enable(phy->dev);
  
  	generic_phy = devm_phy_create(phy->dev, NULL, &ops, NULL);
 -	if (IS_ERR(generic_phy))
 +	if (IS_ERR(generic_phy)) {
 +		pm_runtime_disable(phy->dev);
  		return PTR_ERR(generic_phy);
 +	}
  
  	phy_set_drvdata(generic_phy, phy);
  
diff --cc drivers/usb/chipidea/host.c
index 33027abb5349,4f8eb40ad93a..48731d0bab35
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@@ -115,12 -87,13 +118,13 @@@ static int host_start(struct ci_hdrc *c
  
  	ret = usb_add_hcd(hcd, 0, 0);
  	if (ret) {
 -		goto disable_reg;
 +		goto put_hcd;
  	} else {
- 		struct usb_otg *otg = ci->transceiver->otg;
+ 		struct usb_otg *otg = &ci->otg;
  
  		ci->hcd = hcd;
- 		if (otg) {
+ 
+ 		if (ci_otg_is_fsm_mode(ci)) {
  			otg->host = &hcd->self;
  			hcd->self.otg_port = 1;
  		}