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

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.

1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 75eca42dd607..6223d1757848 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -27,7 +27,7 @@
 #include <linux/of_gpio.h>
 #include <linux/pm_runtime.h>
 
-#include <mach/usb_phy.h>
+#include <linux/usb/tegra_usb_phy.h>
 #include <mach/iomap.h>
 
 #define TEGRA_USB_DMA_ALIGN 32
@@ -49,7 +49,7 @@ static void tegra_ehci_power_up(struct usb_hcd *hcd)
 
         clk_prepare_enable(tegra->emc_clk);
         clk_prepare_enable(tegra->clk);
-        tegra_usb_phy_power_on(tegra->phy);
+        usb_phy_set_suspend(&tegra->phy->u_phy, 0);
         tegra->host_resumed = 1;
 }
 
@@ -58,7 +58,7 @@ static void tegra_ehci_power_down(struct usb_hcd *hcd)
         struct tegra_ehci_hcd *tegra = dev_get_drvdata(hcd->self.controller);
 
         tegra->host_resumed = 0;
-        tegra_usb_phy_power_off(tegra->phy);
+        usb_phy_set_suspend(&tegra->phy->u_phy, 1);
         clk_disable_unprepare(tegra->clk);
         clk_disable_unprepare(tegra->emc_clk);
 }
@@ -715,7 +715,9 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                 goto fail_io;
         }
 
-        err = tegra_usb_phy_power_on(tegra->phy);
+        usb_phy_init(&tegra->phy->u_phy);
+
+        err = usb_phy_set_suspend(&tegra->phy->u_phy, 0);
         if (err) {
                 dev_err(&pdev->dev, "Failed to power on the phy\n");
                 goto fail;
@@ -761,7 +763,7 @@ fail:
         if (!IS_ERR_OR_NULL(tegra->transceiver))
                 otg_set_host(tegra->transceiver->otg, NULL);
 #endif
-        tegra_usb_phy_close(tegra->phy);
+        usb_phy_shutdown(&tegra->phy->u_phy);
 fail_io:
         clk_disable_unprepare(tegra->emc_clk);
 fail_emc_clk:
@@ -789,11 +791,10 @@ static int tegra_ehci_remove(struct platform_device *pdev)
 #endif
 
         usb_remove_hcd(hcd);
-
-        tegra_usb_phy_close(tegra->phy);
-
         usb_put_hcd(hcd);
 
+        usb_phy_shutdown(&tegra->phy->u_phy);
+
         clk_disable_unprepare(tegra->clk);
 
         clk_disable_unprepare(tegra->emc_clk);