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

Commit 21a596c1 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Felipe Balbi
Browse files

usb: renesas_usbhs: Don't check CSSTS bit if peripheral mode 



Since Some SoCs (e.g. R-Car Gen2) don't have the CSSTS bit in the
pipectrl registers ({DCP,PIPEn}CTR) because such SoCs have peripheral
mode only. So, this driver should not check the CSSTS bit if peripheral
mode is running.

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent de18757e

drivers/usb/renesas_usbhs/pipe.c

+2 −4
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int usbhsp_pipe_barrier(struct usbhs_pipe *pipe) 
{

	struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);

	int timeout = 1024;

	u16 val;

	u16 mask = usbhs_mod_is_host(priv) ? (CSSTS | PID_MASK) : PID_MASK;



	/*

	 * make sure....
@@ -265,9 +265,7 @@ static int usbhsp_pipe_barrier(struct usbhs_pipe *pipe) 
	usbhs_pipe_disable(pipe);



	do {

		val  = usbhsp_pipectrl_get(pipe);

		val &= CSSTS | PID_MASK;

		if (!val)

		if (!(usbhsp_pipectrl_get(pipe) & mask))

			return 0;



		udelay(10);