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

Commit 1d6a7b7e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "usb: dwc3: gadget: Enable SUSPEND event after CONNECT DONE""

parents fddfcded b217bf15

drivers/usb/dwc3/gadget.c

+6 −7
Original line number Diff line number Diff line
@@ -2331,8 +2331,14 @@ static void dwc3_gadget_enable_irq(struct dwc3 *dwc) 
			DWC3_DEVTEN_USBRSTEN |

			DWC3_DEVTEN_DISCONNEVTEN);



	/*

	 * Enable SUSPENDEVENT(BIT:6) for version 230A and above

	 * else enable USB Link change event (BIT:3) for older version

	 */

	if (dwc->revision < DWC3_REVISION_230A)

		reg |= DWC3_DEVTEN_ULSTCNGEN;

	else

		reg |= DWC3_DEVTEN_EOPFEN;



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

}
@@ -3400,13 +3406,6 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc) 
	speed = reg & DWC3_DSTS_CONNECTSPD;

	dwc->speed = speed;



	/* Enable SUSPENDEVENT(BIT:6) for version 230A and above */

	if (dwc->revision >= DWC3_REVISION_230A) {

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

		reg |= DWC3_DEVTEN_EOPFEN;

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

	}



	/* Reset the retry on erratic error event count */

	dwc->retries_on_error = 0;