Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 34 insertions, 0 deletions

diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 28e33fea5107..fffdf00f87b9 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -58,17 +58,51 @@ enum fsl_usb2_phy_modes {
         FSL_USB2_PHY_SERIAL,
 };
 
+struct clk;
+struct platform_device;
+
 struct fsl_usb2_platform_data {
         /* board specific information */
         enum fsl_usb2_operating_modes   operating_mode;
         enum fsl_usb2_phy_modes         phy_mode;
         unsigned int                    port_enables;
+        unsigned int                    workaround;
+
+        int             (*init)(struct platform_device *);
+        void            (*exit)(struct platform_device *);
+        void __iomem    *regs;          /* ioremap'd register base */
+        struct clk      *clk;
+        unsigned        power_budget;   /* hcd->power_budget */
+        unsigned        big_endian_mmio:1;
+        unsigned        big_endian_desc:1;
+        unsigned        es:1;           /* need USBMODE:ES */
+        unsigned        le_setup_buf:1;
+        unsigned        have_sysif_regs:1;
+        unsigned        invert_drvvbus:1;
+        unsigned        invert_pwr_fault:1;
+
+        unsigned        suspended:1;
+        unsigned        already_suspended:1;
+
+        /* register save area for suspend/resume */
+        u32             pm_command;
+        u32             pm_status;
+        u32             pm_intr_enable;
+        u32             pm_frame_index;
+        u32             pm_segment;
+        u32             pm_frame_list;
+        u32             pm_async_next;
+        u32             pm_configured_flag;
+        u32             pm_portsc;
+        u32             pm_usbgenctrl;
 };
 
 /* Flags in fsl_usb2_mph_platform_data */
 #define FSL_USB2_PORT0_ENABLED  0x00000001
 #define FSL_USB2_PORT1_ENABLED  0x00000002
 
+#define FLS_USB2_WORKAROUND_ENGCM09152  (1 << 0)
+
 struct spi_device;
 
 struct fsl_spi_platform_data {