aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-fsl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/ehci-fsl.c')
-rw-r--r--drivers/usb/host/ehci-fsl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index a416421abfa2..8600317bd60b 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -233,8 +233,6 @@ static void mpc83xx_usb_setup(struct usb_hcd *hcd)
233 mpc83xx_setup_phy(ehci, pdata->phy_mode, 1); 233 mpc83xx_setup_phy(ehci, pdata->phy_mode, 1);
234 } 234 }
235 235
236 /* put controller in host mode. */
237 ehci_writel(ehci, 0x00000003, non_ehci + FSL_SOC_USB_USBMODE);
238#ifdef CONFIG_PPC_85xx 236#ifdef CONFIG_PPC_85xx
239 out_be32(non_ehci + FSL_SOC_USB_PRICTRL, 0x00000008); 237 out_be32(non_ehci + FSL_SOC_USB_PRICTRL, 0x00000008);
240 out_be32(non_ehci + FSL_SOC_USB_AGECNTTHRSH, 0x00000080); 238 out_be32(non_ehci + FSL_SOC_USB_AGECNTTHRSH, 0x00000080);
@@ -270,6 +268,8 @@ static int ehci_fsl_setup(struct usb_hcd *hcd)
270 /* cache this readonly data; minimize chip reads */ 268 /* cache this readonly data; minimize chip reads */
271 ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); 269 ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
272 270
271 hcd->has_tt = 1;
272
273 retval = ehci_halt(ehci); 273 retval = ehci_halt(ehci);
274 if (retval) 274 if (retval)
275 return retval; 275 return retval;
@@ -279,8 +279,6 @@ static int ehci_fsl_setup(struct usb_hcd *hcd)
279 if (retval) 279 if (retval)
280 return retval; 280 return retval;
281 281
282 hcd->has_tt = 1;
283
284 ehci->sbrn = 0x20; 282 ehci->sbrn = 0x20;
285 283
286 ehci_reset(ehci); 284 ehci_reset(ehci);