usb: chipidea: refine PHY operation

- Delete global_phy due to we can get the phy from phy layer now
- using devm_usb_get_phy to instead of usb_get_phy
- delete the otg_set_peripheral, which should be handled by otg layer

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3 files changed, 27 insertions, 57 deletions

diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
index a37255edc503..dee75c33c08b 100644
--- a/drivers/usb/chipidea/ci.h
+++ b/drivers/usb/chipidea/ci.h
@@ -171,8 +171,6 @@ struct ci_hdrc {
 
         struct ci_hdrc_platform_data    *platdata;
         int                             vbus_active;
-        /* FIXME: some day, we'll not use global phy */
-        bool                            global_phy;
         struct usb_phy                  *transceiver;
         struct usb_hcd                  *hcd;
         struct dentry                   *debugfs;
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index fb38df9356d4..75e23f550736 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -542,38 +542,6 @@ static void ci_get_otg_capable(struct ci_hdrc *ci)
         }
 }
 
-static int ci_usb_phy_init(struct ci_hdrc *ci)
-{
-        int ret;
-
-        if (ci->platdata->phy) {
-                ci->transceiver = ci->platdata->phy;
-                ret = usb_phy_init(ci->transceiver);
-                if (!ret)
-                        hw_wait_phy_stable();
-                return ret;
-        } else {
-                ci->global_phy = true;
-                ci->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
-                if (IS_ERR(ci->transceiver))
-                        ci->transceiver = NULL;
-
-                return 0;
-        }
-}
-
-static void ci_usb_phy_destroy(struct ci_hdrc *ci)
-{
-        if (!ci->transceiver)
-                return;
-
-        otg_set_peripheral(ci->transceiver->otg, NULL);
-        if (ci->global_phy)
-                usb_put_phy(ci->transceiver);
-        else
-                usb_phy_shutdown(ci->transceiver);
-}
-
 static int ci_hdrc_probe(struct platform_device *pdev)
 {
         struct device   *dev = &pdev->dev;
@@ -612,10 +580,31 @@ static int ci_hdrc_probe(struct platform_device *pdev)
 
         hw_phymode_configure(ci);
 
-        ret = ci_usb_phy_init(ci);
+        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;
+
+                dev_err(dev, "no usb2 phy configured\n");
+                return -EPROBE_DEFER;
+        }
+
+        ret = usb_phy_init(ci->transceiver);
         if (ret) {
                 dev_err(dev, "unable to init phy: %d\n", ret);
                 return ret;
+        } else {
+                hw_wait_phy_stable();
         }
 
         ci->hw_bank.phys = res->start;
@@ -624,7 +613,7 @@ static int ci_hdrc_probe(struct platform_device *pdev)
         if (ci->irq < 0) {
                 dev_err(dev, "missing IRQ\n");
                 ret = -ENODEV;
-                goto destroy_phy;
+                goto deinit_phy;
         }
 
         ci_get_otg_capable(ci);
@@ -645,23 +634,12 @@ static int ci_hdrc_probe(struct platform_device *pdev)
                 ret = ci_hdrc_gadget_init(ci);
                 if (ret)
                         dev_info(dev, "doesn't support gadget\n");
-                if (!ret && ci->transceiver) {
-                        ret = otg_set_peripheral(ci->transceiver->otg,
-                                                        &ci->gadget);
-                        /*
-                         * If we implement all USB functions using chipidea drivers,
-                         * it doesn't need to call above API, meanwhile, if we only
-                         * use gadget function, calling above API is useless.
-                         */
-                        if (ret && ret != -ENOTSUPP)
-                                goto destroy_phy;
-                }
         }
 
         if (!ci->roles[CI_ROLE_HOST] && !ci->roles[CI_ROLE_GADGET]) {
                 dev_err(dev, "no supported roles\n");
                 ret = -ENODEV;
-                goto destroy_phy;
+                goto deinit_phy;
         }
 
         if (ci->is_otg) {
@@ -722,8 +700,8 @@ static int ci_hdrc_probe(struct platform_device *pdev)
         free_irq(ci->irq, ci);
 stop:
         ci_role_destroy(ci);
-destroy_phy:
-        ci_usb_phy_destroy(ci);
+deinit_phy:
+        usb_phy_shutdown(ci->transceiver);
 
         return ret;
 }
@@ -741,7 +719,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);
-        ci_usb_phy_destroy(ci);
+        usb_phy_shutdown(ci->transceiver);
         kfree(ci->hw_bank.regmap);
 
         return 0;
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index c318e66cc575..7ec2b54926a0 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1885,12 +1885,6 @@ void ci_hdrc_gadget_destroy(struct ci_hdrc *ci)
 
         dma_pool_destroy(ci->td_pool);
         dma_pool_destroy(ci->qh_pool);
-
-        if (ci->transceiver) {
-                otg_set_peripheral(ci->transceiver->otg, NULL);
-                if (ci->global_phy)
-                        usb_put_phy(ci->transceiver);
-        }
 }
 
 static int udc_id_switch_for_device(struct ci_hdrc *ci)