aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorIvan T. Ivanov <iivanov@mm-sol.com>2014-09-10 20:18:59 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-10 20:30:39 -0400
commitea290056d7c46f7781ff13801048ed957b96d1a5 (patch)
tree147425d4b543584e4ce852720bb92241e23607b7 /drivers/usb
parentc605f3cdff53a743f6d875b76956b239deca1272 (diff)
usb: chipidea: msm: Use USB PHY API to control PHY state
PHY drivers keep track of the current state of the hardware, so don't change PHY settings under it. Cc: 3.16+ <stable@vger.kernel.org> Cc: Tim Bird <tbird20d@gmail.com> Signed-off-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com> Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/chipidea/ci_hdrc_msm.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
index d72b9d2de2c5..30bdd51a6d77 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -20,7 +20,6 @@
20static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) 20static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
21{ 21{
22 struct device *dev = ci->gadget.dev.parent; 22 struct device *dev = ci->gadget.dev.parent;
23 int val;
24 23
25 switch (event) { 24 switch (event) {
26 case CI_HDRC_CONTROLLER_RESET_EVENT: 25 case CI_HDRC_CONTROLLER_RESET_EVENT:
@@ -34,10 +33,7 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
34 * Put the transceiver in non-driving mode. Otherwise host 33 * Put the transceiver in non-driving mode. Otherwise host
35 * may not detect soft-disconnection. 34 * may not detect soft-disconnection.
36 */ 35 */
37 val = usb_phy_io_read(ci->transceiver, ULPI_FUNC_CTRL); 36 usb_phy_notify_disconnect(ci->transceiver, USB_SPEED_UNKNOWN);
38 val &= ~ULPI_FUNC_CTRL_OPMODE_MASK;
39 val |= ULPI_FUNC_CTRL_OPMODE_NONDRIVING;
40 usb_phy_io_write(ci->transceiver, val, ULPI_FUNC_CTRL);
41 break; 37 break;
42 default: 38 default:
43 dev_dbg(dev, "unknown ci_hdrc event\n"); 39 dev_dbg(dev, "unknown ci_hdrc event\n");