diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-19 00:45:18 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-19 00:45:18 -0800 |
| commit | 425ffe81c801b4ecbbb104172ccdfdb3bb38ab7e (patch) | |
| tree | 7f1e3fac6f1218ec694ac31c69f7a9ae9c587f1d /drivers/usb/phy | |
| parent | 8f67f54f65f2d13947e59f396528132c9d05db08 (diff) | |
| parent | a3e98f0134dab0ae0a137c3e0bab68c46c43d028 (diff) | |
Merge "usb: phy: qmp: Select usb3 phy mode before initializing PHY"
Diffstat (limited to 'drivers/usb/phy')
| -rw-r--r-- | drivers/usb/phy/phy-msm-ssusb-qmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/phy/phy-msm-ssusb-qmp.c b/drivers/usb/phy/phy-msm-ssusb-qmp.c index fc61e3172d0b..64916f5566b5 100644 --- a/drivers/usb/phy/phy-msm-ssusb-qmp.c +++ b/drivers/usb/phy/phy-msm-ssusb-qmp.c @@ -307,13 +307,13 @@ static int msm_ssphy_qmp_init(struct usb_phy *uphy) phy->clk_enabled = true; } - writel_relaxed(0x01, - phy->base + phy->phy_reg[USB3_PHY_POWER_DOWN_CONTROL]); - /* 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]); + /* Make sure that above write completed to get PHY into POWER DOWN */ mb(); |