diff options
Diffstat (limited to 'drivers/usb/host/ehci-orion.c')
-rw-r--r-- | drivers/usb/host/ehci-orion.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 82de1073aa52..3e411230953b 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
@@ -106,21 +106,10 @@ static int ehci_orion_setup(struct usb_hcd *hcd) | |||
106 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | 106 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); |
107 | int retval; | 107 | int retval; |
108 | 108 | ||
109 | hcd->has_tt = 1; | 109 | retval = ehci_setup(ehci); |
110 | |||
111 | retval = ehci_halt(ehci); | ||
112 | if (retval) | ||
113 | return retval; | ||
114 | |||
115 | /* | ||
116 | * data structure init | ||
117 | */ | ||
118 | retval = ehci_init(hcd); | ||
119 | if (retval) | 110 | if (retval) |
120 | return retval; | 111 | return retval; |
121 | 112 | ||
122 | ehci_reset(ehci); | ||
123 | |||
124 | ehci_port_power(ehci, 0); | 113 | ehci_port_power(ehci, 0); |
125 | 114 | ||
126 | return retval; | 115 | return retval; |
@@ -261,11 +250,7 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev) | |||
261 | 250 | ||
262 | ehci = hcd_to_ehci(hcd); | 251 | ehci = hcd_to_ehci(hcd); |
263 | ehci->caps = hcd->regs + 0x100; | 252 | ehci->caps = hcd->regs + 0x100; |
264 | ehci->regs = hcd->regs + 0x100 + | ||
265 | HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase)); | ||
266 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); | ||
267 | hcd->has_tt = 1; | 253 | hcd->has_tt = 1; |
268 | ehci->sbrn = 0x20; | ||
269 | 254 | ||
270 | /* | 255 | /* |
271 | * (Re-)program MBUS remapping windows if we are asked to. | 256 | * (Re-)program MBUS remapping windows if we are asked to. |