From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sun, 22 Mar 2015 15:37:57 +0000 (+0200)
Subject: staging: octeon-usb: move fifo setup to controller reset from port reset
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=164814bb6e21dfd27952ddcbe65709ed7aa83d4a;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

staging: octeon-usb: move fifo setup to controller reset from port reset

Move FIFO setup to controller reset from port reset.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/octeon-usb/octeon-hcd.c b/drivers/staging/octeon-usb/octeon-hcd.c
index 4a65af5bb31a..98debd7876b9 100644
--- a/drivers/staging/octeon-usb/octeon-hcd.c
+++ b/drivers/staging/octeon-usb/octeon-hcd.c
@@ -918,6 +918,8 @@ static int cvmx_usb_initialize(struct cvmx_usb_state *usb)
 		 */
 	}
 
+	cvmx_fifo_setup(usb);
+
 	return 0;
 }
 
@@ -1005,8 +1007,6 @@ static int cvmx_usb_enable(struct cvmx_usb_state *usb)
 	usb->usbcx_hprt.u32 = cvmx_usb_read_csr32(usb,
 						  CVMX_USBCX_HPRT(usb->index));
 
-	cvmx_fifo_setup(usb);
-
 	return 0;
 }