Merge branch 'u-boot/master' into 'u-boot-arm/master'

[u-boot] / drivers / usb / host / ehci-ppc4xx.c

diff --git a/drivers/usb/host/ehci-ppc4xx.c b/drivers/usb/host/ehci-ppc4xx.c
index 11799199871ed8ab9e794f9badcc5da7912f67eb..e389c755e1bfa9bdd9cb173e4f41bf294aca2d7a 100644 (file)
--- a/drivers/usb/host/ehci-ppc4xx.c
+++ b/drivers/usb/host/ehci-ppc4xx.c
@@ -23,17 +23,16 @@
 #include <usb.h>
 
 #include "ehci.h"
-#include "ehci-core.h"
 
 /*
  * Create the appropriate control structures to manage
  * a new EHCI host controller.
  */
-int ehci_hcd_init(void)
+int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor)
 {
-       hccr = (struct ehci_hccr *)(CONFIG_SYS_PPC4XX_USB_ADDR);
-       hcor = (struct ehci_hcor *)((uint32_t) hccr +
-               HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
+       *hccr = (struct ehci_hccr *)(CONFIG_SYS_PPC4XX_USB_ADDR);
+       *hcor = (struct ehci_hcor *)((uint32_t) *hccr +
+               HC_LENGTH(ehci_readl(&(*hccr)->cr_capbase)));
        return 0;
 }
 
@@ -41,7 +40,7 @@ int ehci_hcd_init(void)
  * Destroy the appropriate control structures corresponding
  * the the EHCI host controller.
  */
-int ehci_hcd_stop(void)
+int ehci_hcd_stop(int index)
 {
        return 0;
 }