diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-29 14:30:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-29 14:30:43 -0700 |
| commit | a92ee0d3f568a855d77de319d5e6330f3a6384b6 (patch) | |
| tree | 6e983d1941e2a7fa4dce3e942dc5f522e5431363 /drivers | |
| parent | 41471d45794f57f97d6a27f0023d73dfe045f338 (diff) | |
| parent | 9f5b3e1ea4fb9ebf37476f29ffab1b4df5424e61 (diff) | |
Merge "usb: phy: qmp: Select usb3 phy mode during PHY reset"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/phy/phy-msm-ssusb-qmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/phy/phy-msm-ssusb-qmp.c b/drivers/usb/phy/phy-msm-ssusb-qmp.c index c9df25286342..aa11cf2f7417 100644 --- a/drivers/usb/phy/phy-msm-ssusb-qmp.c +++ b/drivers/usb/phy/phy-msm-ssusb-qmp.c @@ -330,10 +330,6 @@ static int msm_ssphy_qmp_init(struct usb_phy *uphy) phy->clk_enabled = true; } - /* select usb3 phy mode */ - if (phy->tcsr_usb3_dp_phymode) - writel_relaxed(0x0, phy->tcsr_usb3_dp_phymode); - writel_relaxed(0x01, phy->base + phy->phy_reg[USB3_PHY_POWER_DOWN_CONTROL]); @@ -409,6 +405,10 @@ static int msm_ssphy_qmp_reset(struct usb_phy *uphy) goto deassert_phy_phy_reset; } + /* select usb3 phy mode */ + if (phy->tcsr_usb3_dp_phymode) + writel_relaxed(0x0, phy->tcsr_usb3_dp_phymode); + /* Deassert USB3 PHY CSR reset */ ret = reset_control_deassert(phy->phy_reset); if (ret) { |