Merge branch 'next'

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

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index a7e105b9921ec600284932493e349663cd8d3016..a1c43f8331787c7cf84e0eabcf0d373ae1ebabe4 100644 (file)
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 NVIDIA Corporation
+ * Copyright (c) 2009-2012 NVIDIA Corporation
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -24,17 +24,32 @@
 #include <usb.h>
 
 #include "ehci.h"
-#include "ehci-core.h"
 
 #include <asm/errno.h>
 #include <asm/arch/usb.h>
 
+/*
+ * A known hardware issue where Connect Status Change bit of PORTSC register
+ * of USB1 controller will be set after Port Reset.
+ * We have to clear it in order for later device enumeration to proceed.
+ * This ehci_powerup_fixup overrides the weak function ehci_powerup_fixup
+ * in "ehci-hcd.c".
+ */
+void ehci_powerup_fixup(uint32_t *status_reg, uint32_t *reg)
+{
+       mdelay(50);
+       if (((u32) status_reg & TEGRA_USB_ADDR_MASK) != TEGRA_USB1_BASE)
+               return;
+       /* For EHCI_PS_CSC to be cleared in ehci_hcd.c */
+       if (ehci_readl(status_reg) & EHCI_PS_CSC)
+               *reg |= EHCI_PS_CSC;
+}
 
 /*
  * 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)
 {
        u32 our_hccr, our_hcor;
 
@@ -42,11 +57,11 @@ int ehci_hcd_init(void)
         * Select the first port, as we don't have a way of selecting others
         * yet
         */
-       if (tegrausb_start_port(0, &our_hccr, &our_hcor))
+       if (tegrausb_start_port(index, &our_hccr, &our_hcor))
                return -1;
 
-       hccr = (struct ehci_hccr *)our_hccr;
-       hcor = (struct ehci_hcor *)our_hcor;
+       *hccr = (struct ehci_hccr *)our_hccr;
+       *hcor = (struct ehci_hcor *)our_hcor;
 
        return 0;
 }
@@ -55,8 +70,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)
 {
-       tegrausb_stop_port();
-       return 0;
+       return tegrausb_stop_port(index);
 }