Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[~andy/linux] / include / linux / fsl_devices.h

diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 28e33fea510736f179ccfdb985e0d630b0aae616..4eb56ed75fbceec07dce3a92cbd5a81b9c150a78 100644 (file)
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -58,17 +58,35 @@ 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        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;
 };
 
 /* 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 {