UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

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

Signed-off-by: John Youn <johnyoun@synopsys.com>
Cc: Robert Baldyga <r.baldyga@samsung.com>
Cc: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
John Youn 2016-10-17 17:36:23 -07:00 committed by Felipe Balbi
parent 51fbc7c06c
commit 2317eacd9c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/dwc2/gadget.c
View File

@ -186,7 +186,7 @@ static void dwc2_hsotg_ctrl_epint(struct dwc2_hsotg *hsotg,
*/ */
static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg) static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg)
{ {
unsigned int fifo; unsigned int ep;
unsigned int addr; unsigned int addr;
int timeout; int timeout;
u32 dptxfsizn; 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 * them to endpoints dynamically according to maxpacket size value of
* given endpoint. * given endpoint.
*/ */
for (fifo = 1; fifo < MAX_EPS_CHANNELS; fifo++) { for (ep = 1; ep < MAX_EPS_CHANNELS; ep++) {
dptxfsizn = dwc2_readl(hsotg->regs + DPTXFSIZN(fifo)); dptxfsizn = dwc2_readl(hsotg->regs + DPTXFSIZN(ep));
val = (dptxfsizn & FIFOSIZE_DEPTH_MASK) | addr; val = (dptxfsizn & FIFOSIZE_DEPTH_MASK) | addr;
addr += dptxfsizn >> FIFOSIZE_DEPTH_SHIFT; addr += dptxfsizn >> FIFOSIZE_DEPTH_SHIFT;
@ -226,7 +226,7 @@ static void dwc2_hsotg_init_fifo(struct dwc2_hsotg *hsotg)
if (addr > hsotg->fifo_mem) if (addr > hsotg->fifo_mem)
break; break;
dwc2_writel(val, hsotg->regs + DPTXFSIZN(fifo)); dwc2_writel(val, hsotg->regs + DPTXFSIZN(ep));
} }
/* /*