mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
usb: mtu3: disable vbus rise/fall interrupts of ltssm
The vbus rise & fall interrupts are used to enable and disable U3 function of device automatically, this cause some issues when class driver is initialized as deactivated, and will skip over software-controlled connect by pullup(), but UDC wants to keep disconnect until usb_gadget_activate() is called which calls pullup() if needed. So we disable vbus rise & fall interrupts and just use pullup() to enable & disable U3 function, and reset mtu3 state when disconnect instead when vbus fall. Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1973d029d6
commit
0eae49582b
2 changed files with 16 additions and 10 deletions
|
@ -181,8 +181,8 @@ static void mtu3_intr_enable(struct mtu3 *mtu)
|
|||
|
||||
if (mtu->is_u3_ip) {
|
||||
/* Enable U3 LTSSM interrupts */
|
||||
value = HOT_RST_INTR | WARM_RST_INTR | VBUS_RISE_INTR |
|
||||
VBUS_FALL_INTR | ENTER_U3_INTR | EXIT_U3_INTR;
|
||||
value = HOT_RST_INTR | WARM_RST_INTR |
|
||||
ENTER_U3_INTR | EXIT_U3_INTR;
|
||||
mtu3_writel(mbase, U3D_LTSSM_INTR_ENABLE, value);
|
||||
}
|
||||
|
||||
|
|
|
@ -585,6 +585,17 @@ static const struct usb_gadget_ops mtu3_gadget_ops = {
|
|||
.udc_stop = mtu3_gadget_stop,
|
||||
};
|
||||
|
||||
static void mtu3_state_reset(struct mtu3 *mtu)
|
||||
{
|
||||
mtu->address = 0;
|
||||
mtu->ep0_state = MU3D_EP0_STATE_SETUP;
|
||||
mtu->may_wakeup = 0;
|
||||
mtu->u1_enable = 0;
|
||||
mtu->u2_enable = 0;
|
||||
mtu->delayed_status = false;
|
||||
mtu->test_mode = false;
|
||||
}
|
||||
|
||||
static void init_hw_ep(struct mtu3 *mtu, struct mtu3_ep *mep,
|
||||
u32 epnum, u32 is_in)
|
||||
{
|
||||
|
@ -702,6 +713,7 @@ void mtu3_gadget_disconnect(struct mtu3 *mtu)
|
|||
spin_lock(&mtu->lock);
|
||||
}
|
||||
|
||||
mtu3_state_reset(mtu);
|
||||
usb_gadget_set_state(&mtu->g, USB_STATE_NOTATTACHED);
|
||||
}
|
||||
|
||||
|
@ -712,12 +724,6 @@ void mtu3_gadget_reset(struct mtu3 *mtu)
|
|||
/* report disconnect, if we didn't flush EP state */
|
||||
if (mtu->g.speed != USB_SPEED_UNKNOWN)
|
||||
mtu3_gadget_disconnect(mtu);
|
||||
|
||||
mtu->address = 0;
|
||||
mtu->ep0_state = MU3D_EP0_STATE_SETUP;
|
||||
mtu->may_wakeup = 0;
|
||||
mtu->u1_enable = 0;
|
||||
mtu->u2_enable = 0;
|
||||
mtu->delayed_status = false;
|
||||
mtu->test_mode = false;
|
||||
else
|
||||
mtu3_state_reset(mtu);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue