usb: chipidea: remove flag CI_HDRC_REQUIRE_TRANSCEIVER

[deliverable/linux.git] / drivers / usb / chipidea / ci_hdrc_msm.c

diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
index 4935ac38fd008d17a51ed866e9fc002cddf021f5..d79ecc08a1be75568a2460ac6d180b7cbe7037b5 100644 (file)
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -26,15 +26,15 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
                dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n");
                writel(0, USB_AHBBURST);
                writel(0, USB_AHBMODE);
-               usb_phy_init(ci->transceiver);
+               usb_phy_init(ci->usb_phy);
                break;
        case CI_HDRC_CONTROLLER_STOPPED_EVENT:
                dev_dbg(dev, "CI_HDRC_CONTROLLER_STOPPED_EVENT received\n");
                /*
-                * Put the transceiver in non-driving mode. Otherwise host
+                * Put the phy in non-driving mode. Otherwise host
                 * may not detect soft-disconnection.
                 */
-               usb_phy_notify_disconnect(ci->transceiver, USB_SPEED_UNKNOWN);
+               usb_phy_notify_disconnect(ci->usb_phy, USB_SPEED_UNKNOWN);
                break;
        default:
                dev_dbg(dev, "unknown ci_hdrc event\n");
@@ -46,7 +46,6 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = {
        .name                   = "ci_hdrc_msm",
        .capoffset              = DEF_CAPOFFSET,
        .flags                  = CI_HDRC_REGS_SHARED |
-                                 CI_HDRC_REQUIRE_TRANSCEIVER |
                                  CI_HDRC_DISABLE_STREAMING,
 
        .notify_event           = ci_hdrc_msm_notify_event,
@@ -68,7 +67,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
        if (IS_ERR(phy))
                return PTR_ERR(phy);
 
-       ci_hdrc_msm_platdata.phy = phy;
+       ci_hdrc_msm_platdata.usb_phy = phy;
 
        plat_ci = ci_hdrc_add_device(&pdev->dev,
                                pdev->resource, pdev->num_resources,