diff options
author | Peter Chen <peter.chen@freescale.com> | 2014-03-18 15:58:37 +0800 |
---|---|---|
committer | Peter Chen <peter.chen@freescale.com> | 2014-03-18 16:04:45 +0800 |
commit | 15b95d690ced4ab4c8065fb500a84a955268bf1c (patch) | |
tree | a357fe04b3b9149d787d16ab1d9ce989b5d03fe8 | |
parent | 4e76c0406a4ddffdc2887eddfd30b688231023ab (diff) |
ENGR00303890-1 Revert "usb: chipidea: put hw_phymode_configure before ci_usb_phy_init"
This reverts commit 6cf1375d32049b7d852131d232ec97e76535a2e0
in order to avoid system hang access portsc without PHY clock.
See: http://marc.info/?l=linux-arm-kernel&m=139350618732108&w=2
Signed-off-by: Peter Chen <peter.chen@freescale.com>
-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 fb38df9356d4..28c0c0f3bf0b 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -610,8 +610,6 @@ static int ci_hdrc_probe(struct platform_device *pdev) return -ENODEV; } - hw_phymode_configure(ci); - ret = ci_usb_phy_init(ci); if (ret) { dev_err(dev, "unable to init phy: %d\n", ret); @@ -629,6 +627,8 @@ static int ci_hdrc_probe(struct platform_device *pdev) ci_get_otg_capable(ci); + hw_phymode_configure(ci); + dr_mode = ci->platdata->dr_mode; ci->supports_runtime_pm = !!(ci->platdata->flags & |