diff options
Diffstat (limited to 'drivers/usb/chipidea/ci_hdrc_msm.c')
-rw-r--r-- | drivers/usb/chipidea/ci_hdrc_msm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 4935ac38fd00..d79ecc08a1be 100644 --- 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) | |||
26 | dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n"); | 26 | dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n"); |
27 | writel(0, USB_AHBBURST); | 27 | writel(0, USB_AHBBURST); |
28 | writel(0, USB_AHBMODE); | 28 | writel(0, USB_AHBMODE); |
29 | usb_phy_init(ci->transceiver); | 29 | usb_phy_init(ci->usb_phy); |
30 | break; | 30 | break; |
31 | case CI_HDRC_CONTROLLER_STOPPED_EVENT: | 31 | case CI_HDRC_CONTROLLER_STOPPED_EVENT: |
32 | dev_dbg(dev, "CI_HDRC_CONTROLLER_STOPPED_EVENT received\n"); | 32 | dev_dbg(dev, "CI_HDRC_CONTROLLER_STOPPED_EVENT received\n"); |
33 | /* | 33 | /* |
34 | * Put the transceiver in non-driving mode. Otherwise host | 34 | * Put the phy in non-driving mode. Otherwise host |
35 | * may not detect soft-disconnection. | 35 | * may not detect soft-disconnection. |
36 | */ | 36 | */ |
37 | usb_phy_notify_disconnect(ci->transceiver, USB_SPEED_UNKNOWN); | 37 | usb_phy_notify_disconnect(ci->usb_phy, USB_SPEED_UNKNOWN); |
38 | break; | 38 | break; |
39 | default: | 39 | default: |
40 | dev_dbg(dev, "unknown ci_hdrc event\n"); | 40 | dev_dbg(dev, "unknown ci_hdrc event\n"); |
@@ -46,7 +46,6 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { | |||
46 | .name = "ci_hdrc_msm", | 46 | .name = "ci_hdrc_msm", |
47 | .capoffset = DEF_CAPOFFSET, | 47 | .capoffset = DEF_CAPOFFSET, |
48 | .flags = CI_HDRC_REGS_SHARED | | 48 | .flags = CI_HDRC_REGS_SHARED | |
49 | CI_HDRC_REQUIRE_TRANSCEIVER | | ||
50 | CI_HDRC_DISABLE_STREAMING, | 49 | CI_HDRC_DISABLE_STREAMING, |
51 | 50 | ||
52 | .notify_event = ci_hdrc_msm_notify_event, | 51 | .notify_event = ci_hdrc_msm_notify_event, |
@@ -68,7 +67,7 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev) | |||
68 | if (IS_ERR(phy)) | 67 | if (IS_ERR(phy)) |
69 | return PTR_ERR(phy); | 68 | return PTR_ERR(phy); |
70 | 69 | ||
71 | ci_hdrc_msm_platdata.phy = phy; | 70 | ci_hdrc_msm_platdata.usb_phy = phy; |
72 | 71 | ||
73 | plat_ci = ci_hdrc_add_device(&pdev->dev, | 72 | plat_ci = ci_hdrc_add_device(&pdev->dev, |
74 | pdev->resource, pdev->num_resources, | 73 | pdev->resource, pdev->num_resources, |