5 files changed, 107 insertions, 3 deletions

diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index 0fd3fbdd8283..f32a64e57f97 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -34,6 +34,7 @@
 #define __LINUX_USB_CH9_H
 
 #include <linux/types.h>        /* __u8 etc */
+#include <asm/byteorder.h>      /* le16_to_cpu */
 
 /*-------------------------------------------------------------------------*/
 
@@ -143,6 +144,11 @@
 #define USB_INTRF_FUNC_SUSPEND  0       /* function suspend */
 
 #define USB_INTR_FUNC_SUSPEND_OPT_MASK  0xFF00
+/*
+ * Suspend Options, Table 9-7 USB 3.0 spec
+ */
+#define USB_INTRF_FUNC_SUSPEND_LP       (1 << (8 + 0))
+#define USB_INTRF_FUNC_SUSPEND_RW       (1 << (8 + 1))
 
 #define USB_ENDPOINT_HALT               0       /* IN/OUT will STALL */
 
@@ -570,6 +576,17 @@ static inline int usb_endpoint_is_isoc_out(
         return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd);
 }
 
+/**
+ * usb_endpoint_maxp - get endpoint's max packet size
+ * @epd: endpoint to be checked
+ *
+ * Returns @epd's max packet
+ */
+static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
+{
+        return le16_to_cpu(epd->wMaxPacketSize);
+}
+
 /*-------------------------------------------------------------------------*/
 
 /* USB_DT_SS_ENDPOINT_COMP: SuperSpeed Endpoint Companion descriptor */
@@ -851,6 +868,18 @@ enum usb_device_speed {
         USB_SPEED_SUPER,                        /* usb 3.0 */
 };
 
+#ifdef __KERNEL__
+
+/**
+ * usb_speed_string() - Returns human readable-name of the speed.
+ * @speed: The speed to return human-readable name for.  If it's not
+ *   any of the speeds defined in usb_device_speed enum, string for
+ *   USB_SPEED_UNKNOWN will be returned.
+ */
+extern const char *usb_speed_string(enum usb_device_speed speed);
+
+#endif
+
 enum usb_device_state {
         /* NOTATTACHED isn't in the USB spec, and this state acts
          * the same as ATTACHED ... but it's clearer this way.
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 087f4b931833..1d3a67523ffc 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -437,9 +437,9 @@ static inline void usb_ep_fifo_flush(struct usb_ep *ep)
 
 struct usb_dcd_config_params {
         __u8  bU1devExitLat;    /* U1 Device exit Latency */
-#define USB_DEFULT_U1_DEV_EXIT_LAT      0x01    /* Less then 1 microsec */
+#define USB_DEFAULT_U1_DEV_EXIT_LAT     0x01    /* Less then 1 microsec */
         __le16 bU2DevExitLat;   /* U2 Device exit Latency */
-#define USB_DEFULT_U2_DEV_EXIT_LAT      0x1F4   /* Less then 500 microsec */
+#define USB_DEFAULT_U2_DEV_EXIT_LAT     0x1F4   /* Less then 500 microsec */
 };
 
 
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 0097136ba45d..03354d557b79 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -178,7 +178,7 @@ struct usb_hcd {
          * this structure.
          */
         unsigned long hcd_priv[0]
-                        __attribute__ ((aligned(sizeof(unsigned long))));
+                        __attribute__ ((aligned(sizeof(s64))));
 };
 
 /* 2.4 does this a bit differently ... */
@@ -343,6 +343,7 @@ struct hc_driver {
                  * address is set
                  */
         int     (*update_device)(struct usb_hcd *, struct usb_device *);
+        int     (*set_usb2_hw_lpm)(struct usb_hcd *, struct usb_device *, int);
 };
 
 extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb);
diff --git a/include/linux/usb/r8a66597.h b/include/linux/usb/r8a66597.h
index b6b8660d0c68..55805f9dcf21 100644
--- a/include/linux/usb/r8a66597.h
+++ b/include/linux/usb/r8a66597.h
@@ -48,6 +48,9 @@ struct r8a66597_platdata {
 
         /* (external controller only) set one = WR0_N shorted to WR1_N */
         unsigned        wr0_shorted_to_wr1:1;
+
+        /* set one = using SUDMAC */
+        unsigned        sudmac:1;
 };
 
 /* Register definitions */
@@ -417,5 +420,62 @@ struct r8a66597_platdata {
 #define USBSPD          0x00C0
 #define RTPORT          0x0001
 
+/* SUDMAC registers */
+#define CH0CFG          0x00
+#define CH1CFG          0x04
+#define CH0BA           0x10
+#define CH1BA           0x14
+#define CH0BBC          0x18
+#define CH1BBC          0x1C
+#define CH0CA           0x20
+#define CH1CA           0x24
+#define CH0CBC          0x28
+#define CH1CBC          0x2C
+#define CH0DEN          0x30
+#define CH1DEN          0x34
+#define DSTSCLR         0x38
+#define DBUFCTRL        0x3C
+#define DINTCTRL        0x40
+#define DINTSTS         0x44
+#define DINTSTSCLR      0x48
+#define CH0SHCTRL       0x50
+#define CH1SHCTRL       0x54
+
+/* SUDMAC Configuration Registers */
+#define SENDBUFM        0x1000 /* b12: Transmit Buffer Mode */
+#define RCVENDM         0x0100 /* b8: Receive Data Transfer End Mode */
+#define LBA_WAIT        0x0030 /* b5-4: Local Bus Access Wait */
+
+/* DMA Enable Registers */
+#define DEN             0x0001 /* b1: DMA Transfer Enable */
+
+/* DMA Status Clear Register */
+#define CH1STCLR        0x0002 /* b2: Ch1 DMA Status Clear */
+#define CH0STCLR        0x0001 /* b1: Ch0 DMA Status Clear */
+
+/* DMA Buffer Control Register */
+#define CH1BUFW         0x0200 /* b9: Ch1 DMA Buffer Data Transfer Enable */
+#define CH0BUFW         0x0100 /* b8: Ch0 DMA Buffer Data Transfer Enable */
+#define CH1BUFS         0x0002 /* b2: Ch1 DMA Buffer Data Status */
+#define CH0BUFS         0x0001 /* b1: Ch0 DMA Buffer Data Status */
+
+/* DMA Interrupt Control Register */
+#define CH1ERRE         0x0200 /* b9: Ch1 SHwy Res Err Detect Int Enable */
+#define CH0ERRE         0x0100 /* b8: Ch0 SHwy Res Err Detect Int Enable */
+#define CH1ENDE         0x0002 /* b2: Ch1 DMA Transfer End Int Enable */
+#define CH0ENDE         0x0001 /* b1: Ch0 DMA Transfer End Int Enable */
+
+/* DMA Interrupt Status Register */
+#define CH1ERRS         0x0200 /* b9: Ch1 SHwy Res Err Detect Int Status */
+#define CH0ERRS         0x0100 /* b8: Ch0 SHwy Res Err Detect Int Status */
+#define CH1ENDS         0x0002 /* b2: Ch1 DMA Transfer End Int Status */
+#define CH0ENDS         0x0001 /* b1: Ch0 DMA Transfer End Int Status */
+
+/* DMA Interrupt Status Clear Register */
+#define CH1ERRC         0x0200 /* b9: Ch1 SHwy Res Err Detect Int Stat Clear */
+#define CH0ERRC         0x0100 /* b8: Ch0 SHwy Res Err Detect Int Stat Clear */
+#define CH1ENDC         0x0002 /* b2: Ch1 DMA Transfer End Int Stat Clear */
+#define CH0ENDC         0x0001 /* b1: Ch0 DMA Transfer End Int Stat Clear */
+
 #endif /* __LINUX_USB_R8A66597_H */
 
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index 8977431259c6..e5a40c318548 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -82,6 +82,13 @@ struct renesas_usbhs_platform_callback {
          * get VBUS status function.
          */
         int (*get_vbus)(struct platform_device *pdev);
+
+        /*
+         * option:
+         *
+         * VBUS control is needed for Host
+         */
+        int (*set_vbus)(struct platform_device *pdev, int enable);
 };
 
 /*
@@ -101,6 +108,8 @@ struct renesas_usbhs_driver_param {
          * option:
          *
          * for BUSWAIT :: BWAIT
+         * see
+         *      renesas_usbhs/common.c :: usbhsc_set_buswait()
          * */
         int buswait_bwait;
 
@@ -127,6 +136,11 @@ struct renesas_usbhs_driver_param {
          * pio <--> dma border.
          */
         int pio_dma_border; /* default is 64byte */
+
+        /*
+         * option:
+         */
+        u32 has_otg:1; /* for controlling PWEN/EXTLP */
 };
 
 /*