diff options
Diffstat (limited to 'drivers/usb/host/ehci-pmcmsp.c')
-rw-r--r-- | drivers/usb/host/ehci-pmcmsp.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/usb/host/ehci-pmcmsp.c b/drivers/usb/host/ehci-pmcmsp.c index e8d54de44acc..087aee2a904f 100644 --- a/drivers/usb/host/ehci-pmcmsp.c +++ b/drivers/usb/host/ehci-pmcmsp.c | |||
@@ -78,27 +78,14 @@ static int ehci_msp_setup(struct usb_hcd *hcd) | |||
78 | { | 78 | { |
79 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); | 79 | struct ehci_hcd *ehci = hcd_to_ehci(hcd); |
80 | int retval; | 80 | int retval; |
81 | |||
81 | ehci->big_endian_mmio = 1; | 82 | ehci->big_endian_mmio = 1; |
82 | ehci->big_endian_desc = 1; | 83 | ehci->big_endian_desc = 1; |
83 | 84 | ||
84 | ehci->caps = hcd->regs; | 85 | ehci->caps = hcd->regs; |
85 | ehci->regs = hcd->regs + | ||
86 | HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase)); | ||
87 | dbg_hcs_params(ehci, "reset"); | ||
88 | dbg_hcc_params(ehci, "reset"); | ||
89 | |||
90 | /* cache this readonly data; minimize chip reads */ | ||
91 | ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); | ||
92 | hcd->has_tt = 1; | 86 | hcd->has_tt = 1; |
93 | 87 | ||
94 | retval = ehci_halt(ehci); | 88 | retval = ehci_setup(hcd); |
95 | if (retval) | ||
96 | return retval; | ||
97 | |||
98 | ehci_reset(ehci); | ||
99 | |||
100 | /* data structure init */ | ||
101 | retval = ehci_init(hcd); | ||
102 | if (retval) | 89 | if (retval) |
103 | return retval; | 90 | return retval; |
104 | 91 | ||