diff options
Diffstat (limited to 'drivers/usb/host/ehci-mx6.c')
| -rw-r--r-- | drivers/usb/host/ehci-mx6.c | 11 | 
1 files changed, 5 insertions, 6 deletions
| diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 028024298..9ce25da59 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -25,7 +25,6 @@  #include <asm/imx-common/iomux-v3.h>  #include "ehci.h" -#include "ehci-core.h"  #define USB_OTGREGS_OFFSET	0x000  #define USB_H1REGS_OFFSET	0x200 @@ -160,7 +159,7 @@ static void usbh1_oc_config(void)  	__raw_writel(val, usbother_base + USB_H1_CTRL_OFFSET);  } -int ehci_hcd_init(void) +int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)  {  	struct usb_ehci *ehci; @@ -182,9 +181,9 @@ int ehci_hcd_init(void)  	ehci = (struct usb_ehci *)(USBOH3_USB_BASE_ADDR +  		(0x200 * CONFIG_MXC_USB_PORT)); -	hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength); -	hcor = (struct ehci_hcor *)((uint32_t)hccr + -			HC_LENGTH(ehci_readl(&hccr->cr_capbase))); +	*hccr = (struct ehci_hccr *)((uint32_t)&ehci->caplength); +	*hcor = (struct ehci_hcor *)((uint32_t)*hccr + +			HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));  	setbits_le32(&ehci->usbmode, CM_HOST);  	__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc); @@ -195,7 +194,7 @@ int ehci_hcd_init(void)  	return 0;  } -int ehci_hcd_stop(void) +int ehci_hcd_stop(int index)  {  	return 0;  } |