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

Commit 2317eacd authored by John Youn's avatar John Youn Committed by Felipe Balbi
Browse files

Revert "usb: dwc2: gadget: change variable name to more meaningful" 



This reverts commit ba48eab8 ("usb: dwc2: gadget: change variable
name to more meaningful").

This is needed to cleanly revert commit aa381a72 ("usb: dwc2:
gadget: fix TX FIFO size and address initialization") which may cause
regressions on some platforms.

Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Cc: Robert Baldyga <r.baldyga@samsung.com>
Cc: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 51fbc7c0

drivers/usb/dwc2/gadget.c

+4 −4
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void dwc2_hsotg_ctrl_epint(struct dwc2_hsotg *hsotg, 
 */

static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg)

{

	unsigned int fifo;

	unsigned int ep;

	unsigned int addr;

	int timeout;

	u32 dptxfsizn;
@@ -217,8 +217,8 @@ static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg) 
	 * them to endpoints dynamically according to maxpacket size value of

	 * given endpoint.

	 */

	for (fifo = 1; fifo < MAX_EPS_CHANNELS; fifo++) {

		dptxfsizn = dwc2_readl(hsotg->regs + DPTXFSIZN(fifo));

	for (ep = 1; ep < MAX_EPS_CHANNELS; ep++) {

		dptxfsizn = dwc2_readl(hsotg->regs + DPTXFSIZN(ep));



		val = (dptxfsizn & FIFOSIZE_DEPTH_MASK) | addr;

		addr += dptxfsizn >> FIFOSIZE_DEPTH_SHIFT;
@@ -226,7 +226,7 @@ static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg) 
		if (addr > hsotg->fifo_mem)

			break;



		dwc2_writel(val, hsotg->regs + DPTXFSIZN(fifo));

		dwc2_writel(val, hsotg->regs + DPTXFSIZN(ep));

	}



	/*