hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: octeon-usb: use __delay() instead of cvmx_wait() 

Commit edf188bee1 ("MIPS: Octeon: Remove usage of cvmx_wait()
everywhere.") deleted cvmx_wait() but forgot to update OCTEON USB
staging driver. Fix that to allow driver build.

Fixes: edf188bee1 ("MIPS: Octeon: Remove usage of cvmx_wait() everywhere.")
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: James Hogan <jhogan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2017-11-17 09:50:10 +02:00 committed by Greg Kroah-Hartman
parent b77992d2df
commit 0590cdfead
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/octeon-usb/octeon-hcd.c
View File

@ -394,7 +394,7 @@ struct octeon_hcd {
result = -1; \ result = -1; \
break; \ break; \
} else \ } else \
cvmx_wait(100); \ __delay(100); \
} \ } \
} while (0); \ } while (0); \
result; }) result; })
@ -774,7 +774,7 @@ retry:
usbn_clk_ctl.s.hclk_rst = 1; usbn_clk_ctl.s.hclk_rst = 1;
cvmx_write64_uint64(CVMX_USBNX_CLK_CTL(usb->index), usbn_clk_ctl.u64); cvmx_write64_uint64(CVMX_USBNX_CLK_CTL(usb->index), usbn_clk_ctl.u64);
/* 2e. Wait 64 core-clock cycles for HCLK to stabilize */ /* 2e. Wait 64 core-clock cycles for HCLK to stabilize */
cvmx_wait(64); __delay(64);
/* /*
* 3. Program the power-on reset field in the USBN clock-control * 3. Program the power-on reset field in the USBN clock-control
* register: * register:
@ -795,7 +795,7 @@ retry:
cvmx_write64_uint64(CVMX_USBNX_USBP_CTL_STATUS(usb->index), cvmx_write64_uint64(CVMX_USBNX_USBP_CTL_STATUS(usb->index),
usbn_usbp_ctl_status.u64); usbn_usbp_ctl_status.u64);
/* 6. Wait 10 cycles */ /* 6. Wait 10 cycles */
cvmx_wait(10); __delay(10);
/* /*
* 7. Clear ATE_RESET field in the USBN clock-control register: * 7. Clear ATE_RESET field in the USBN clock-control register:
* USBN_USBP_CTL_STATUS[ATE_RESET] = 0 * USBN_USBP_CTL_STATUS[ATE_RESET] = 0