diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-20 23:45:15 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 23:45:14 -0800 |
| commit | bcf71a62b06d9c35bc823b76b1bd86c02a404c78 (patch) | |
| tree | 7361e34492754ec2eeff13dd875ed6301ad4f8df | |
| parent | cc4405e27b638878a7aacc4bdc8fbe3b8c2b425e (diff) | |
| parent | 317f5e44fbbb9f6245d71f4583a8ae3154813d9c (diff) | |
Merge "usb: phy: qusb: Keep LDOs ON during disconnect if PMI voted for it"
| -rw-r--r-- | drivers/usb/phy/phy-msm-qusb.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-msm-qusb.c b/drivers/usb/phy/phy-msm-qusb.c index 07c96419fd60..09a61acceb81 100644 --- a/drivers/usb/phy/phy-msm-qusb.c +++ b/drivers/usb/phy/phy-msm-qusb.c @@ -701,7 +701,12 @@ static int qusb_phy_set_suspend(struct usb_phy *phy, int suspend) if (qphy->tcsr_clamp_dig_n) writel_relaxed(0x0, qphy->tcsr_clamp_dig_n); - qusb_phy_enable_power(qphy, false); + /* Do not disable power rails if there is vote for it */ + if (!qphy->rm_pulldown) + qusb_phy_enable_power(qphy, false); + else + dev_dbg(phy->dev, "race with rm_pulldown. Keep ldo ON\n"); + /* * Set put_into_high_z_state to true so next USB * cable connect, DPF_DMF request performs PHY |