|
@@ -372,13 +372,13 @@ static void musb_otg_timer_func(unsigned long data)
|
|
|
case OTG_STATE_A_SUSPEND:
|
|
|
case OTG_STATE_A_WAIT_BCON:
|
|
|
dev_dbg(musb->controller, "HNP: %s timeout\n",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
musb_platform_set_vbus(musb, 0);
|
|
|
musb->xceiv->state = OTG_STATE_A_WAIT_VFALL;
|
|
|
break;
|
|
|
default:
|
|
|
dev_dbg(musb->controller, "HNP: Unhandled mode %s\n",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
}
|
|
|
musb->ignore_disconnect = 0;
|
|
|
spin_unlock_irqrestore(&musb->lock, flags);
|
|
@@ -393,13 +393,14 @@ void musb_hnp_stop(struct musb *musb)
|
|
|
void __iomem *mbase = musb->mregs;
|
|
|
u8 reg;
|
|
|
|
|
|
- dev_dbg(musb->controller, "HNP: stop from %s\n", otg_state_string(musb->xceiv->state));
|
|
|
+ dev_dbg(musb->controller, "HNP: stop from %s\n",
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
|
|
|
switch (musb->xceiv->state) {
|
|
|
case OTG_STATE_A_PERIPHERAL:
|
|
|
musb_g_disconnect(musb);
|
|
|
dev_dbg(musb->controller, "HNP: back to %s\n",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
break;
|
|
|
case OTG_STATE_B_HOST:
|
|
|
dev_dbg(musb->controller, "HNP: Disabling HR\n");
|
|
@@ -413,7 +414,7 @@ void musb_hnp_stop(struct musb *musb)
|
|
|
break;
|
|
|
default:
|
|
|
dev_dbg(musb->controller, "HNP: Stopping in unknown state %s\n",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -451,7 +452,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
|
|
|
*/
|
|
|
if (int_usb & MUSB_INTR_RESUME) {
|
|
|
handled = IRQ_HANDLED;
|
|
|
- dev_dbg(musb->controller, "RESUME (%s)\n", otg_state_string(musb->xceiv->state));
|
|
|
+ dev_dbg(musb->controller, "RESUME (%s)\n", usb_otg_state_string(musb->xceiv->state));
|
|
|
|
|
|
if (devctl & MUSB_DEVCTL_HM) {
|
|
|
void __iomem *mbase = musb->mregs;
|
|
@@ -493,7 +494,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
|
|
|
default:
|
|
|
WARNING("bogus %s RESUME (%s)\n",
|
|
|
"host",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
}
|
|
|
} else {
|
|
|
switch (musb->xceiv->state) {
|
|
@@ -522,7 +523,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
|
|
|
default:
|
|
|
WARNING("bogus %s RESUME (%s)\n",
|
|
|
"peripheral",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -538,7 +539,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
|
|
|
}
|
|
|
|
|
|
dev_dbg(musb->controller, "SESSION_REQUEST (%s)\n",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
|
|
|
/* IRQ arrives from ID pin sense or (later, if VBUS power
|
|
|
* is removed) SRP. responses are time critical:
|
|
@@ -603,7 +604,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
|
|
|
}
|
|
|
|
|
|
dev_dbg(musb->controller, "VBUS_ERROR in %s (%02x, %s), retry #%d, port1 %08x\n",
|
|
|
- otg_state_string(musb->xceiv->state),
|
|
|
+ usb_otg_state_string(musb->xceiv->state),
|
|
|
devctl,
|
|
|
({ char *s;
|
|
|
switch (devctl & MUSB_DEVCTL_VBUS) {
|
|
@@ -628,7 +629,7 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
|
|
|
|
|
|
if (int_usb & MUSB_INTR_SUSPEND) {
|
|
|
dev_dbg(musb->controller, "SUSPEND (%s) devctl %02x\n",
|
|
|
- otg_state_string(musb->xceiv->state), devctl);
|
|
|
+ usb_otg_state_string(musb->xceiv->state), devctl);
|
|
|
handled = IRQ_HANDLED;
|
|
|
|
|
|
switch (musb->xceiv->state) {
|
|
@@ -745,12 +746,12 @@ b_host:
|
|
|
usb_hcd_resume_root_hub(hcd);
|
|
|
|
|
|
dev_dbg(musb->controller, "CONNECT (%s) devctl %02x\n",
|
|
|
- otg_state_string(musb->xceiv->state), devctl);
|
|
|
+ usb_otg_state_string(musb->xceiv->state), devctl);
|
|
|
}
|
|
|
|
|
|
if ((int_usb & MUSB_INTR_DISCONNECT) && !musb->ignore_disconnect) {
|
|
|
dev_dbg(musb->controller, "DISCONNECT (%s) as %s, devctl %02x\n",
|
|
|
- otg_state_string(musb->xceiv->state),
|
|
|
+ usb_otg_state_string(musb->xceiv->state),
|
|
|
MUSB_MODE(musb), devctl);
|
|
|
handled = IRQ_HANDLED;
|
|
|
|
|
@@ -787,7 +788,7 @@ b_host:
|
|
|
break;
|
|
|
default:
|
|
|
WARNING("unhandled DISCONNECT transition (%s)\n",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -813,7 +814,7 @@ b_host:
|
|
|
}
|
|
|
} else {
|
|
|
dev_dbg(musb->controller, "BUS RESET as %s\n",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
switch (musb->xceiv->state) {
|
|
|
case OTG_STATE_A_SUSPEND:
|
|
|
/* We need to ignore disconnect on suspend
|
|
@@ -826,7 +827,7 @@ b_host:
|
|
|
case OTG_STATE_A_WAIT_BCON: /* OPT TD.4.7-900ms */
|
|
|
/* never use invalid T(a_wait_bcon) */
|
|
|
dev_dbg(musb->controller, "HNP: in %s, %d msec timeout\n",
|
|
|
- otg_state_string(musb->xceiv->state),
|
|
|
+ usb_otg_state_string(musb->xceiv->state),
|
|
|
TA_WAIT_BCON(musb));
|
|
|
mod_timer(&musb->otg_timer, jiffies
|
|
|
+ msecs_to_jiffies(TA_WAIT_BCON(musb)));
|
|
@@ -838,7 +839,7 @@ b_host:
|
|
|
break;
|
|
|
case OTG_STATE_B_WAIT_ACON:
|
|
|
dev_dbg(musb->controller, "HNP: RESET (%s), to b_peripheral\n",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
musb->xceiv->state = OTG_STATE_B_PERIPHERAL;
|
|
|
musb_g_reset(musb);
|
|
|
break;
|
|
@@ -850,7 +851,7 @@ b_host:
|
|
|
break;
|
|
|
default:
|
|
|
dev_dbg(musb->controller, "Unhandled BUS RESET as %s\n",
|
|
|
- otg_state_string(musb->xceiv->state));
|
|
|
+ usb_otg_state_string(musb->xceiv->state));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1632,7 +1633,7 @@ musb_mode_show(struct device *dev, struct device_attribute *attr, char *buf)
|
|
|
int ret = -EINVAL;
|
|
|
|
|
|
spin_lock_irqsave(&musb->lock, flags);
|
|
|
- ret = sprintf(buf, "%s\n", otg_state_string(musb->xceiv->state));
|
|
|
+ ret = sprintf(buf, "%s\n", usb_otg_state_string(musb->xceiv->state));
|
|
|
spin_unlock_irqrestore(&musb->lock, flags);
|
|
|
|
|
|
return ret;
|