diff options
author | Chris Ruehl <chris.ruehl@gtsys.com.hk> | 2014-01-10 00:51:30 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-13 18:55:19 -0500 |
commit | cd0b42c2a6d2a74244f0053f8960f5dad5842278 (patch) | |
tree | bb2cf3eec954dc45f930db827f4f0cdfe1697d9d /drivers/usb | |
parent | 3b5d3e6845bfe68777d069886b0d1cd5f23b9d58 (diff) |
usb: chipidea: put hw_phymode_configure before ci_usb_phy_init
hw_phymode_configure configures the PORTSC registers and allow the
following phy_inits to operate on the right parameters. This fix a problem
where the UPLI (ISP1504) could not be detected, because the Viewport was not
available and read the viewport return 0's only.
Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/chipidea/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index edeec3638684..33f22bc6ad7f 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c | |||
@@ -559,6 +559,8 @@ static int ci_hdrc_probe(struct platform_device *pdev) | |||
559 | return -ENODEV; | 559 | return -ENODEV; |
560 | } | 560 | } |
561 | 561 | ||
562 | hw_phymode_configure(ci); | ||
563 | |||
562 | ret = ci_usb_phy_init(ci); | 564 | ret = ci_usb_phy_init(ci); |
563 | if (ret) { | 565 | if (ret) { |
564 | dev_err(dev, "unable to init phy: %d\n", ret); | 566 | dev_err(dev, "unable to init phy: %d\n", ret); |
@@ -576,8 +578,6 @@ static int ci_hdrc_probe(struct platform_device *pdev) | |||
576 | 578 | ||
577 | ci_get_otg_capable(ci); | 579 | ci_get_otg_capable(ci); |
578 | 580 | ||
579 | hw_phymode_configure(ci); | ||
580 | |||
581 | dr_mode = ci->platdata->dr_mode; | 581 | dr_mode = ci->platdata->dr_mode; |
582 | /* initialize role(s) before the interrupt is requested */ | 582 | /* initialize role(s) before the interrupt is requested */ |
583 | if (dr_mode == USB_DR_MODE_OTG || dr_mode == USB_DR_MODE_HOST) { | 583 | if (dr_mode == USB_DR_MODE_OTG || dr_mode == USB_DR_MODE_HOST) { |