From: Olof Johansson <olof@lixom.net>
Date: Fri, 21 Sep 2012 03:07:06 +0000 (-0700)
Subject: Merge tag 'xceiv-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... 
X-Git-Tag: v3.7-rc1~158^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=36f926cfad7aa3d9a2cac25e9317b4f69e9320d6;p=linux.git

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

usb: xceiv: patches for v3.7 merge window

nop xceiv got its own header to avoid polluting otg.h. It has also
learned to work as USB2 and USB3 phys so we can use it on USB3
controllers.

Together with those two changes to nop xceiv, we're adding basic
PHY support to dwc3 driver, this is to allow platforms which actually
have a SW-controllable PHY talk to them through dwc3 driver.

We're adding a new phy driver for the OMAP architecture. This driver
is for the PHY found in OMAP4 SoCs, and a new phy driver for the
marvell architecture. An extra phy driver - for Tegra SoCs - is now
moving from arch/arm/mach-tegra* to drivers/usb/phy.

Also here, there's the creation of <linux/usb/phy.h> which should be
used from now on for PHY drivers, even those which don't support
OTG.

* tag 'xceiv-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
  usb: otg: mxs-phy: Fix mx23 operation
  usb: dwc3: add basic PHY support
  usb: dwc3: exynos: add nop transceiver support
  usb: dwc3: omap: add nop transceiver support
  usb: dwc3: pci: add nop transceiver support
  usb: otg: move the dereference below the NULL test
  arm: omap: phy: remove unused functions from omap-phy-internal.c
  usb: twl4030: Add device tree support for twl4030 usb
  usb: twl6030: Add dt support for twl6030 usb
  usb: otg: make twl6030_usb as a comparator driver to omap_usb2
  usb: phy: add a new driver for omap usb2 phy
  usb: phy: fix build break
  usb: move phy driver from mach-tegra to drivers/usb
  usb: otg: Move phy interface to separate file.
  usb: phy: isp1301: Remove unused static array and define
  usb: phy: mv_u3d: Add usb phy driver for mv_u3d
  usb: otg: Remove the unneeded NULL check
  usb: xceiv: nop: let it work as USB2 and USB3 phy
  usb: xceiv: create nop-usb-xceiv.h and avoid pollution on otg.h

Signed-off-by: Olof Johansson <olof@lixom.net>
---

36f926cfad7aa3d9a2cac25e9317b4f69e9320d6
diff --cc drivers/usb/host/ehci-tegra.c
index 26dedb30ad0b,65408f7ae92b..c0d47323b52a
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -799,12 -801,11 +801,12 @@@ static int tegra_ehci_remove(struct pla
  #endif
  
  	usb_remove_hcd(hcd);
 -	usb_put_hcd(hcd);
  
- 	tegra_usb_phy_close(tegra->phy);
+ 	usb_phy_shutdown(&tegra->phy->u_phy);
  	iounmap(hcd->regs);
  
 +	usb_put_hcd(hcd);
 +
  	clk_disable_unprepare(tegra->clk);
  	clk_put(tegra->clk);