From: Tony Lindgren <tony@atomide.com>
Date: Fri, 24 Aug 2007 13:33:02 +0000 (-0700)
Subject: musb_hdrc: Make tusb use musb_set_vbus() to turn on VBUS
X-Git-Tag: v2.6.23-omap1~139
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1e45c757ed3d7940efab47316f3ff0bf17146bd6;p=linux-2.6-omap-h63xx.git

musb_hdrc: Make tusb use musb_set_vbus() to turn on VBUS

Make tusb use musb_set_vbus() to turn on VBUS.

This should probably be handled in core musb code eventually.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 7006ecb8864..23840dcab78 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -721,12 +721,7 @@ tusb_otg_ints(struct musb *musb, u32 int_src, void __iomem *base)
 			switch (musb->xceiv.state) {
 			case OTG_STATE_A_IDLE:
 				DBG(2, "Got SRP, turning on VBUS\n");
-				devctl = musb_readb(musb->mregs,
-							MUSB_DEVCTL);
-				devctl |= MUSB_DEVCTL_SESSION;
-				musb_writeb(musb->mregs, MUSB_DEVCTL,
-							devctl);
-				musb->xceiv.state = OTG_STATE_A_WAIT_VRISE;
+				musb_set_vbus(musb, 1);
 
 				/* CONNECT can wake if a_wait_bcon is set */
 				if (musb->a_wait_bcon != 0)