Merge tag 'usb-for-v3.19' of git://git.kernel.org/pub/scm/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>

1 files changed, 68 insertions, 21 deletions

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 9bdc6bd73432..60578d9c896d 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -47,6 +47,7 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
+#include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/idr.h>
@@ -299,6 +300,49 @@ static void hw_phymode_configure(struct ci_hdrc *ci)
 }
 
 /**
+ * _ci_usb_phy_init: initialize phy taking in account both phy and usb_phy
+ * interfaces
+ * @ci: the controller
+ *
+ * This function returns an error code if the phy failed to init
+ */
+static int _ci_usb_phy_init(struct ci_hdrc *ci)
+{
+        int ret;
+
+        if (ci->phy) {
+                ret = phy_init(ci->phy);
+                if (ret)
+                        return ret;
+
+                ret = phy_power_on(ci->phy);
+                if (ret) {
+                        phy_exit(ci->phy);
+                        return ret;
+                }
+        } else {
+                ret = usb_phy_init(ci->usb_phy);
+        }
+
+        return ret;
+}
+
+/**
+ * _ci_usb_phy_exit: deinitialize phy taking in account both phy and usb_phy
+ * interfaces
+ * @ci: the controller
+ */
+static void ci_usb_phy_exit(struct ci_hdrc *ci)
+{
+        if (ci->phy) {
+                phy_power_off(ci->phy);
+                phy_exit(ci->phy);
+        } else {
+                usb_phy_shutdown(ci->usb_phy);
+        }
+}
+
+/**
  * ci_usb_phy_init: initialize phy according to different phy type
  * @ci: the controller
  *
@@ -312,7 +356,7 @@ static int ci_usb_phy_init(struct ci_hdrc *ci)
         case USBPHY_INTERFACE_MODE_UTMI:
         case USBPHY_INTERFACE_MODE_UTMIW:
         case USBPHY_INTERFACE_MODE_HSIC:
-                ret = usb_phy_init(ci->transceiver);
+                ret = _ci_usb_phy_init(ci);
                 if (ret)
                         return ret;
                 hw_phymode_configure(ci);
@@ -320,12 +364,12 @@ static int ci_usb_phy_init(struct ci_hdrc *ci)
         case USBPHY_INTERFACE_MODE_ULPI:
         case USBPHY_INTERFACE_MODE_SERIAL:
                 hw_phymode_configure(ci);
-                ret = usb_phy_init(ci->transceiver);
+                ret = _ci_usb_phy_init(ci);
                 if (ret)
                         return ret;
                 break;
         default:
-                ret = usb_phy_init(ci->transceiver);
+                ret = _ci_usb_phy_init(ci);
         }
 
         return ret;
@@ -605,23 +649,26 @@ static int ci_hdrc_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        if (ci->platdata->phy)
-                ci->transceiver = ci->platdata->phy;
-        else
-                ci->transceiver = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
-
-        if (IS_ERR(ci->transceiver)) {
-                ret = PTR_ERR(ci->transceiver);
-                /*
-                 * if -ENXIO is returned, it means PHY layer wasn't
-                 * enabled, so it makes no sense to return -EPROBE_DEFER
-                 * in that case, since no PHY driver will ever probe.
-                 */
-                if (ret == -ENXIO)
-                        return ret;
+        if (ci->platdata->phy) {
+                ci->phy = ci->platdata->phy;
+        } else if (ci->platdata->usb_phy) {
+                ci->usb_phy = ci->platdata->usb_phy;
+        } else {
+                ci->phy = devm_phy_get(dev, "usb-phy");
+                ci->usb_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+
+                /* if both generic PHY and USB PHY layers aren't enabled */
+                if (PTR_ERR(ci->phy) == -ENOSYS &&
+                                PTR_ERR(ci->usb_phy) == -ENXIO)
+                        return -ENXIO;
+
+                if (IS_ERR(ci->phy) && IS_ERR(ci->usb_phy))
+                        return -EPROBE_DEFER;
 
-                dev_err(dev, "no usb2 phy configured\n");
-                return -EPROBE_DEFER;
+                if (IS_ERR(ci->phy))
+                        ci->phy = NULL;
+                else if (IS_ERR(ci->usb_phy))
+                        ci->usb_phy = NULL;
         }
 
         ret = ci_usb_phy_init(ci);
@@ -728,7 +775,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
 stop:
         ci_role_destroy(ci);
 deinit_phy:
-        usb_phy_shutdown(ci->transceiver);
+        ci_usb_phy_exit(ci);
 
         return ret;
 }
@@ -741,7 +788,7 @@ static int ci_hdrc_remove(struct platform_device *pdev)
         free_irq(ci->irq, ci);
         ci_role_destroy(ci);
         ci_hdrc_enter_lpm(ci, true);
-        usb_phy_shutdown(ci->transceiver);
+        ci_usb_phy_exit(ci);
 
         return 0;
 }