Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e274a31e authored by Pratyush Anand's avatar Pratyush Anand Committed by Felipe Balbi
Browse files

usb: dwc3: enable ACCEPT{U1,U2}ENA when SetConfiguration received 



As per databook, ACCEPT{U1,U2}ENA bits should be set after receiving
SetConfiguration Command.

Signed-off-by: default avatarPratyush Anand <pratyush.anand@st.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent dd864f20

drivers/usb/dwc3/ep0.c

+9 −0
Original line number Diff line number Diff line
@@ -474,6 +474,7 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) 
{

	u32 cfg;

	int ret;

	u32 reg;



	dwc->start_config_issued = false;

	cfg = le16_to_cpu(ctrl->wValue);
@@ -488,6 +489,14 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) 
		/* if the cfg matches and the cfg is non zero */

		if (cfg && (!ret || (ret == USB_GADGET_DELAYED_STATUS))) {

			dwc->dev_state = DWC3_CONFIGURED_STATE;

			/*

			 * Enable transition to U1/U2 state when

			 * nothing is pending from application.

			 */

			reg = dwc3_readl(dwc->regs, DWC3_DCTL);

			reg |= (DWC3_DCTL_ACCEPTU1ENA | DWC3_DCTL_ACCEPTU2ENA);

			dwc3_writel(dwc->regs, DWC3_DCTL, reg);



			dwc->resize_fifos = true;

			dev_dbg(dwc->dev, "resize fifos flag SET\n");

		}

drivers/usb/dwc3/gadget.c

+0 −1
Original line number Diff line number Diff line
@@ -2020,7 +2020,6 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc) 


	reg = dwc3_readl(dwc->regs, DWC3_DCTL);

	reg &= ~DWC3_DCTL_TSTCTRL_MASK;

	reg |= (DWC3_DCTL_ACCEPTU1ENA | DWC3_DCTL_ACCEPTU2ENA);

	dwc3_writel(dwc->regs, DWC3_DCTL, reg);

	dwc->test_mode = false;