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.

5 files changed, 219 insertions, 0 deletions

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index c34452a7304..79a24fab13d 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -50,6 +50,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
 
+#include <linux/usb/otg.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
@@ -136,6 +137,8 @@ static void dwc3_core_soft_reset(struct dwc3 *dwc)
         reg |= DWC3_GUSB2PHYCFG_PHYSOFTRST;
         dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
 
+        usb_phy_init(dwc->usb2_phy);
+        usb_phy_init(dwc->usb3_phy);
         mdelay(100);
 
         /* Clear USB3 PHY reset */
@@ -465,6 +468,18 @@ static int __devinit dwc3_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
+        dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+        if (IS_ERR_OR_NULL(dwc->usb2_phy)) {
+                dev_err(dev, "no usb2 phy configured\n");
+                return -EPROBE_DEFER;
+        }
+
+        dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3);
+        if (IS_ERR_OR_NULL(dwc->usb3_phy)) {
+                dev_err(dev, "no usb3 phy configured\n");
+                return -EPROBE_DEFER;
+        }
+
         spin_lock_init(&dwc->lock);
         platform_set_drvdata(pdev, dwc);
 
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 151eca876df..dbc5713d84f 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -624,6 +624,8 @@ struct dwc3_scratchpad_array {
  * @maximum_speed: maximum speed requested (mainly for testing purposes)
  * @revision: revision register contents
  * @mode: mode of operation
+ * @usb2_phy: pointer to USB2 PHY
+ * @usb3_phy: pointer to USB3 PHY
  * @is_selfpowered: true when we are selfpowered
  * @three_stage_setup: set if we perform a three phase setup
  * @ep0_bounced: true when we used bounce buffer
@@ -667,6 +669,9 @@ struct dwc3 {
         struct usb_gadget       gadget;
         struct usb_gadget_driver *gadget_driver;
 
+        struct usb_phy          *usb2_phy;
+        struct usb_phy          *usb3_phy;
+
         void __iomem            *regs;
         size_t                  regs_size;
 
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index b8f00389fa3..ca6597853f9 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -19,16 +19,74 @@
 #include <linux/platform_data/dwc3-exynos.h>
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/nop-usb-xceiv.h>
 
 #include "core.h"
 
 struct dwc3_exynos {
         struct platform_device  *dwc3;
+        struct platform_device  *usb2_phy;
+        struct platform_device  *usb3_phy;
         struct device           *dev;
 
         struct clk              *clk;
 };
 
+static int __devinit dwc3_exynos_register_phys(struct dwc3_exynos *exynos)
+{
+        struct nop_usb_xceiv_platform_data pdata;
+        struct platform_device  *pdev;
+        int                     ret;
+
+        memset(&pdata, 0x00, sizeof(pdata));
+
+        pdev = platform_device_alloc("nop_usb_xceiv", 0);
+        if (!pdev)
+                return -ENOMEM;
+
+        exynos->usb2_phy = pdev;
+        pdata.type = USB_PHY_TYPE_USB2;
+
+        ret = platform_device_add_data(exynos->usb2_phy, &pdata, sizeof(pdata));
+        if (ret)
+                goto err1;
+
+        pdev = platform_device_alloc("nop_usb_xceiv", 1);
+        if (!pdev) {
+                ret = -ENOMEM;
+                goto err1;
+        }
+
+        exynos->usb3_phy = pdev;
+        pdata.type = USB_PHY_TYPE_USB3;
+
+        ret = platform_device_add_data(exynos->usb3_phy, &pdata, sizeof(pdata));
+        if (ret)
+                goto err2;
+
+        ret = platform_device_add(exynos->usb2_phy);
+        if (ret)
+                goto err2;
+
+        ret = platform_device_add(exynos->usb3_phy);
+        if (ret)
+                goto err3;
+
+        return 0;
+
+err3:
+        platform_device_del(exynos->usb2_phy);
+
+err2:
+        platform_device_put(exynos->usb3_phy);
+
+err1:
+        platform_device_put(exynos->usb2_phy);
+
+        return ret;
+}
+
 static int __devinit dwc3_exynos_probe(struct platform_device *pdev)
 {
         struct dwc3_exynos_data *pdata = pdev->dev.platform_data;
@@ -51,6 +109,12 @@ static int __devinit dwc3_exynos_probe(struct platform_device *pdev)
         if (devid < 0)
                 goto err1;
 
+        ret = dwc3_exynos_register_phys(exynos);
+        if (ret) {
+                dev_err(&pdev->dev, "couldn't register PHYs\n");
+                goto err1;
+        }
+
         dwc3 = platform_device_alloc("dwc3", devid);
         if (!dwc3) {
                 dev_err(&pdev->dev, "couldn't allocate dwc3 device\n");
@@ -120,6 +184,8 @@ static int __devexit dwc3_exynos_remove(struct platform_device *pdev)
         struct dwc3_exynos_data *pdata = pdev->dev.platform_data;
 
         platform_device_unregister(exynos->dwc3);
+        platform_device_unregister(exynos->usb2_phy);
+        platform_device_unregister(exynos->usb3_phy);
 
         dwc3_put_device_id(exynos->dwc3->id);
 
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 479dc047da3..ee57a10d90d 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -48,6 +48,9 @@
 #include <linux/io.h>
 #include <linux/of.h>
 
+#include <linux/usb/otg.h>
+#include <linux/usb/nop-usb-xceiv.h>
+
 #include "core.h"
 
 /*
@@ -131,6 +134,8 @@ struct dwc3_omap {
         spinlock_t              lock;
 
         struct platform_device  *dwc3;
+        struct platform_device  *usb2_phy;
+        struct platform_device  *usb3_phy;
         struct device           *dev;
 
         int                     irq;
@@ -152,6 +157,59 @@ static inline void dwc3_omap_writel(void __iomem *base, u32 offset, u32 value)
         writel(value, base + offset);
 }
 
+static int __devinit dwc3_omap_register_phys(struct dwc3_omap *omap)
+{
+        struct nop_usb_xceiv_platform_data pdata;
+        struct platform_device  *pdev;
+        int                     ret;
+
+        memset(&pdata, 0x00, sizeof(pdata));
+
+        pdev = platform_device_alloc("nop_usb_xceiv", 0);
+        if (!pdev)
+                return -ENOMEM;
+
+        omap->usb2_phy = pdev;
+        pdata.type = USB_PHY_TYPE_USB2;
+
+        ret = platform_device_add_data(omap->usb2_phy, &pdata, sizeof(pdata));
+        if (ret)
+                goto err1;
+
+        pdev = platform_device_alloc("nop_usb_xceiv", 1);
+        if (!pdev) {
+                ret = -ENOMEM;
+                goto err1;
+        }
+
+        omap->usb3_phy = pdev;
+        pdata.type = USB_PHY_TYPE_USB3;
+
+        ret = platform_device_add_data(omap->usb3_phy, &pdata, sizeof(pdata));
+        if (ret)
+                goto err2;
+
+        ret = platform_device_add(omap->usb2_phy);
+        if (ret)
+                goto err2;
+
+        ret = platform_device_add(omap->usb3_phy);
+        if (ret)
+                goto err3;
+
+        return 0;
+
+err3:
+        platform_device_del(omap->usb2_phy);
+
+err2:
+        platform_device_put(omap->usb3_phy);
+
+err1:
+        platform_device_put(omap->usb2_phy);
+
+        return ret;
+}
 
 static irqreturn_t dwc3_omap_interrupt(int irq, void *_omap)
 {
@@ -251,6 +309,12 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
+        ret = dwc3_omap_register_phys(omap);
+        if (ret) {
+                dev_err(dev, "couldn't register PHYs\n");
+                return ret;
+        }
+
         devid = dwc3_get_device_id();
         if (devid < 0)
                 return -ENODEV;
@@ -371,6 +435,8 @@ static int __devexit dwc3_omap_remove(struct platform_device *pdev)
         struct dwc3_omap        *omap = platform_get_drvdata(pdev);
 
         platform_device_unregister(omap->dwc3);
+        platform_device_unregister(omap->usb2_phy);
+        platform_device_unregister(omap->usb3_phy);
 
         dwc3_put_device_id(omap->dwc3->id);
 
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index a9ca9adba39..94f550e37f9 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -42,6 +42,9 @@
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 
+#include <linux/usb/otg.h>
+#include <linux/usb/nop-usb-xceiv.h>
+
 #include "core.h"
 
 /* FIXME define these in <linux/pci_ids.h> */
@@ -51,8 +54,64 @@
 struct dwc3_pci {
         struct device           *dev;
         struct platform_device  *dwc3;
+        struct platform_device  *usb2_phy;
+        struct platform_device  *usb3_phy;
 };
 
+static int __devinit dwc3_pci_register_phys(struct dwc3_pci *glue)
+{
+        struct nop_usb_xceiv_platform_data pdata;
+        struct platform_device  *pdev;
+        int                     ret;
+
+        memset(&pdata, 0x00, sizeof(pdata));
+
+        pdev = platform_device_alloc("nop_usb_xceiv", 0);
+        if (!pdev)
+                return -ENOMEM;
+
+        glue->usb2_phy = pdev;
+        pdata.type = USB_PHY_TYPE_USB2;
+
+        ret = platform_device_add_data(glue->usb2_phy, &pdata, sizeof(pdata));
+        if (ret)
+                goto err1;
+
+        pdev = platform_device_alloc("nop_usb_xceiv", 1);
+        if (!pdev) {
+                ret = -ENOMEM;
+                goto err1;
+        }
+
+        glue->usb3_phy = pdev;
+        pdata.type = USB_PHY_TYPE_USB3;
+
+        ret = platform_device_add_data(glue->usb3_phy, &pdata, sizeof(pdata));
+        if (ret)
+                goto err2;
+
+        ret = platform_device_add(glue->usb2_phy);
+        if (ret)
+                goto err2;
+
+        ret = platform_device_add(glue->usb3_phy);
+        if (ret)
+                goto err3;
+
+        return 0;
+
+err3:
+        platform_device_del(glue->usb2_phy);
+
+err2:
+        platform_device_put(glue->usb3_phy);
+
+err1:
+        platform_device_put(glue->usb2_phy);
+
+        return ret;
+}
+
 static int __devinit dwc3_pci_probe(struct pci_dev *pci,
                 const struct pci_device_id *id)
 {
@@ -80,6 +139,12 @@ static int __devinit dwc3_pci_probe(struct pci_dev *pci,
         pci_set_power_state(pci, PCI_D0);
         pci_set_master(pci);
 
+        ret = dwc3_pci_register_phys(glue);
+        if (ret) {
+                dev_err(dev, "couldn't register PHYs\n");
+                return ret;
+        }
+
         devid = dwc3_get_device_id();
         if (devid < 0) {
                 ret = -ENOMEM;
@@ -144,6 +209,8 @@ static void __devexit dwc3_pci_remove(struct pci_dev *pci)
 {
         struct dwc3_pci *glue = pci_get_drvdata(pci);
 
+        platform_device_unregister(glue->usb2_phy);
+        platform_device_unregister(glue->usb3_phy);
         dwc3_put_device_id(glue->dwc3->id);
         platform_device_unregister(glue->dwc3);
         pci_set_drvdata(pci, NULL);