|
@@ -352,20 +352,19 @@ static void omap2430_musb_enable(struct musb *musb)
|
|
|
|
|
|
case USB_EVENT_ID:
|
|
|
otg_init(musb->xceiv);
|
|
|
- if (data->interface_type == MUSB_INTERFACE_UTMI) {
|
|
|
- devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
|
|
|
- /* start the session */
|
|
|
- devctl |= MUSB_DEVCTL_SESSION;
|
|
|
- musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
|
|
|
- while (musb_readb(musb->mregs, MUSB_DEVCTL) &
|
|
|
- MUSB_DEVCTL_BDEVICE) {
|
|
|
- cpu_relax();
|
|
|
-
|
|
|
- if (time_after(jiffies, timeout)) {
|
|
|
- dev_err(musb->controller,
|
|
|
- "configured as A device timeout");
|
|
|
- break;
|
|
|
- }
|
|
|
+ if (data->interface_type != MUSB_INTERFACE_UTMI)
|
|
|
+ break;
|
|
|
+ devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
|
|
|
+ /* start the session */
|
|
|
+ devctl |= MUSB_DEVCTL_SESSION;
|
|
|
+ musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
|
|
|
+ while (musb_readb(musb->mregs, MUSB_DEVCTL) &
|
|
|
+ MUSB_DEVCTL_BDEVICE) {
|
|
|
+ cpu_relax();
|
|
|
+
|
|
|
+ if (time_after(jiffies, timeout)) {
|
|
|
+ dev_err(dev, "configured as A device timeout");
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
break;
|