The USB phy is used both for data transfer and to charge the battery.
If the charger it active it will hold a reference to
usb3v1. In that case we don't want to power-down the phy.
This allows charging to continue while the device is suspended.
Signed-off-by: NeilBrown <neilb@xxxxxxx>
---
drivers/usb/otg/twl4030-usb.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index c4a86da..bd8fe9b 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -388,10 +388,16 @@ static void twl4030_phy_power(struct twl4030_usb *twl, int on)
(PHY_CLK_CTRL_CLOCKGATING_EN |
PHY_CLK_CTRL_CLK32K_EN));
} else {
- __twl4030_phy_power(twl, 0);
regulator_disable(twl->usb1v5);
regulator_disable(twl->usb1v8);
regulator_disable(twl->usb3v1);
+ if (!regulator_is_enabled(twl->usb3v1))
+ /* no-one else is requesting this
+ * so it is OK to power-down the
+ * phy. Sometimes a charger might
+ * hold the regulator active.
+ */
+ __twl4030_phy_power(twl, 0);
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
