Merge tag 'pci-v3.18-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[firefly-linux-kernel-4.4.55.git] / drivers / usb / dwc2 / core.h

diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 1efd10cc962918898d7cc2d827f616ad02719eae..bf015ab3b44c80ae76631b3d63268a0701ef5707 100644 (file)
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -139,6 +139,7 @@ struct s3c_hsotg_ep {
        unsigned int            last_load;
        unsigned int            fifo_load;
        unsigned short          fifo_size;
+       unsigned short          fifo_index;
 
        unsigned char           dir_in;
        unsigned char           index;
@@ -194,8 +195,10 @@ struct s3c_hsotg {
        struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsotg_supply_names)];
 
        u32                     phyif;
+       int                     fifo_mem;
        unsigned int            dedicated_fifos:1;
        unsigned char           num_of_eps;
+       u32                     fifo_map;
 
        struct dentry           *debug_root;
        struct dentry           *debug_file;
@@ -501,6 +504,10 @@ struct dwc2_hw_params {
  *                      a_peripheral and b_device=>b_host) this may not match
  *                      the core, but allows the software to determine
  *                      transitions
+ * @dr_mode:            Requested mode of operation, one of following:
+ *                      - USB_DR_MODE_PERIPHERAL
+ *                      - USB_DR_MODE_HOST
+ *                      - USB_DR_MODE_OTG
  * @queuing_high_bandwidth: True if multiple packets of a high-bandwidth
  *                      transfer are in process of being queued
  * @srp_success:        Stores status of SRP request in the case of a FS PHY
@@ -592,6 +599,7 @@ struct dwc2_hsotg {
        /** Params to actually use */
        struct dwc2_core_params *core_params;
        enum usb_otg_state op_state;
+       enum usb_dr_mode dr_mode;
 
        unsigned int queuing_high_bandwidth:1;
        unsigned int srp_success:1;