4 files changed, 14 insertions, 4 deletions

diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h
index 9655e3569d4c..d738603a2757 100644
--- a/drivers/usb/chipidea/ci.h
+++ b/drivers/usb/chipidea/ci.h
@@ -160,6 +160,8 @@ struct ci13xxx {
 
         struct ci13xxx_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;
 };
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 39603d7b7916..1083585fad00 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -419,6 +419,10 @@ static int __devinit ci_hdrc_probe(struct platform_device *pdev)
 
         ci->dev = dev;
         ci->platdata = dev->platform_data;
+        if (ci->platdata->phy)
+                ci->transceiver = ci->platdata->phy;
+        else
+                ci->global_phy = true;
 
         ret = hw_device_init(ci, base);
         if (ret < 0) {
diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index 4a4fdb8c65f8..ebff9f4f56ec 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -117,6 +117,7 @@ static int host_start(struct ci13xxx *ci)
         hcd->has_tt = 1;
 
         hcd->power_budget = ci->platdata->power_budget;
+        hcd->phy = ci->transceiver;
 
         ehci = hcd_to_ehci(hcd);
         ehci->caps = ci->hw_bank.cap;
diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index ba8284e2a237..c7a032a4f0c5 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1685,7 +1685,8 @@ static int udc_start(struct ci13xxx *ci)
 
         ci->gadget.ep0 = &ci->ep0in->ep;
 
-        ci->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
+        if (ci->global_phy)
+                ci->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
 
         if (ci->platdata->flags & CI13XXX_REQUIRE_TRANSCEIVER) {
                 if (ci->transceiver == NULL) {
@@ -1729,7 +1730,8 @@ static int udc_start(struct ci13xxx *ci)
 remove_trans:
         if (!IS_ERR_OR_NULL(ci->transceiver)) {
                 otg_set_peripheral(ci->transceiver->otg, &ci->gadget);
-                usb_put_phy(ci->transceiver);
+                if (ci->global_phy)
+                        usb_put_phy(ci->transceiver);
         }
 
         dev_err(dev, "error = %i\n", retval);
@@ -1738,7 +1740,7 @@ remove_dbg:
 unreg_device:
         device_unregister(&ci->gadget.dev);
 put_transceiver:
-        if (!IS_ERR_OR_NULL(ci->transceiver))
+        if (!IS_ERR_OR_NULL(ci->transceiver) && ci->global_phy)
                 usb_put_phy(ci->transceiver);
 free_pools:
         dma_pool_destroy(ci->td_pool);
@@ -1772,7 +1774,8 @@ static void udc_stop(struct ci13xxx *ci)
 
         if (!IS_ERR_OR_NULL(ci->transceiver)) {
                 otg_set_peripheral(ci->transceiver->otg, NULL);
-                usb_put_phy(ci->transceiver);
+                if (ci->global_phy)
+                        usb_put_phy(ci->transceiver);
         }
         dbg_remove_files(&ci->gadget.dev);
         device_unregister(&ci->gadget.dev);