USB: ehci tdi : let's tdi_reset set host mode

tdi_reset is already taking care of setting host mode for tdi devices.
Don't duplicate code in platform driver.

Make ehci_halt a nop if the controller is not in host mode (otherwise it 
will fail), and let's ehci_reset do the tdi_reset.
We need to move hcd->has_tt flags before ehci_halt, in order ehci_halt 
knows we are a tdi device.


Before the setup routine was doing :
- put controller in host mode
- ehci_halt
- ehci_init
- hcd->has_tt = 1;
- ehci_reset

Now we do :
- hcd->has_tt = 1;
- ehci_halt
- ehci_init
- ehci_reset

PS : now we handle correctly the device -> host transition.

Signed-off-by: Matthieu CASTET <matthieu.castet@parrot.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 3 insertions, 10 deletions

diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index a8ad8ac120a2..ac9c4d7c44af 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -26,9 +26,6 @@
 #include <mach/mxc_ehci.h>
 
 #define ULPI_VIEWPORT_OFFSET    0x170
-#define PORTSC_OFFSET           0x184
-#define USBMODE_OFFSET          0x1a8
-#define USBMODE_CM_HOST         3
 
 struct ehci_mxc_priv {
         struct clk *usbclk, *ahbclk;
@@ -51,6 +48,8 @@ static int ehci_mxc_setup(struct usb_hcd *hcd)
         /* cache this readonly data; minimize chip reads */
         ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
 
+        hcd->has_tt = 1;
+
         retval = ehci_halt(ehci);
         if (retval)
                 return retval;
@@ -60,8 +59,6 @@ static int ehci_mxc_setup(struct usb_hcd *hcd)
         if (retval)
                 return retval;
 
-        hcd->has_tt = 1;
-
         ehci->sbrn = 0x20;
 
         ehci_reset(ehci);
@@ -191,12 +188,8 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
                 clk_enable(priv->ahbclk);
         }
 
-        /* set USBMODE to host mode */
-        temp = readl(hcd->regs + USBMODE_OFFSET);
-        writel(temp | USBMODE_CM_HOST, hcd->regs + USBMODE_OFFSET);
-
         /* set up the PORTSCx register */
-        writel(pdata->portsc, hcd->regs + PORTSC_OFFSET);
+        ehci_writel(ehci, pdata->portsc, &ehci->regs->port_status[0]);
         mdelay(10);
 
         /* setup specific usb hw */