1 files changed, 43 insertions, 5 deletions

diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index bd6ff489baf..e897262c6a6 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -75,6 +75,7 @@ struct ehci_hcd {			/* one per controller */
         struct ehci_qh          *async;
         struct ehci_qh          *dummy;         /* For AMD quirk use */
         struct ehci_qh          *reclaim;
+        struct ehci_qh          *qh_scan_next;
         unsigned                scanning : 1;
 
         /* periodic schedule support */
@@ -87,6 +88,8 @@ struct ehci_hcd {			/* one per controller */
         union ehci_shadow       *pshadow;       /* mirror hw periodic table */
         int                     next_uframe;    /* scan periodic, start here */
         unsigned                periodic_sched; /* periodic activity count */
+        unsigned                uframe_periodic_max; /* max periodic time per uframe */
+
 
         /* list of itds & sitds completed while clock_frame was still active */
         struct list_head        cached_itd_list;
@@ -117,7 +120,6 @@ struct ehci_hcd {			/* one per controller */
         struct timer_list       iaa_watchdog;
         struct timer_list       watchdog;
         unsigned long           actions;
-        unsigned                stamp;
         unsigned                periodic_stamp;
         unsigned                random_frame;
         unsigned long           next_statechange;
@@ -137,6 +139,11 @@ struct ehci_hcd {			/* one per controller */
         unsigned                fs_i_thresh:1;  /* Intel iso scheduling */
         unsigned                use_dummy_qh:1; /* AMD Frame List table quirk*/
         unsigned                has_synopsys_hc_bug:1; /* Synopsys HC */
+        unsigned                frame_index_bug:1; /* MosChip (AKA NetMos) */
+#ifdef CONFIG_USB_EHCI_TEGRA
+        unsigned                controller_resets_phy:1;
+        unsigned                controller_remote_wakeup:1;
+#endif
 
         /* required for usb32 quirk */
         #define OHCI_CTRL_HCFS          (3 << 6)
@@ -163,10 +170,6 @@ struct ehci_hcd {			/* one per controller */
 #ifdef DEBUG
         struct dentry           *debug_dir;
 #endif
-        /*
-         * OTG controllers and transceivers need software interaction
-         */
-        struct otg_transceiver  *transceiver;
 };
 
 /* convert between an HCD pointer and the corresponding EHCI_HCD */
@@ -343,6 +346,7 @@ struct ehci_qh {
         struct ehci_qh          *reclaim;       /* next to reclaim */
 
         struct ehci_hcd         *ehci;
+        unsigned long           unlink_time;
 
         /*
          * Do NOT use atomic operations for QH refcounting. On some CPUs
@@ -374,6 +378,7 @@ struct ehci_qh {
 #define NO_FRAME ((unsigned short)~0)                   /* pick new start */
 
         struct usb_device       *dev;           /* access to TT */
+        unsigned                is_out:1;       /* bulk or intr OUT */
         unsigned                clearing_tt:1;  /* Clear-TT-Buf in progress */
 };
 
@@ -736,6 +741,39 @@ static inline u32 hc32_to_cpup (const struct ehci_hcd *ehci, const __hc32 *x)
 
 /*-------------------------------------------------------------------------*/
 
+#ifdef CONFIG_PCI
+
+/* For working around the MosChip frame-index-register bug */
+static unsigned ehci_read_frame_index(struct ehci_hcd *ehci);
+
+#else
+
+static inline unsigned ehci_read_frame_index(struct ehci_hcd *ehci)
+{
+        return ehci_readl(ehci, &ehci->regs->frame_index);
+}
+
+#endif
+
+/*
+ * Writing to dma coherent memory on ARM may be delayed via L2
+ * writing buffer, so introduce the helper which can flush L2 writing
+ * buffer into memory immediately, especially used to flush ehci
+ * descriptor to memory.
+ * */
+#ifdef  CONFIG_ARM_DMA_MEM_BUFFERABLE
+static inline void ehci_sync_mem()
+{
+        mb();
+}
+#else
+static inline void ehci_sync_mem()
+{
+}
+#endif
+
+/*-------------------------------------------------------------------------*/
+
 #ifndef DEBUG
 #define STUB_DEBUG_FILES
 #endif  /* DEBUG */