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

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

diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 4eb56ed75fbceec07dce3a92cbd5a81b9c150a78..fffdf00f87b91bd94f09071db3b999f7e5e5d210 100644 (file)
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -72,6 +72,7 @@ struct fsl_usb2_platform_data {
        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 */
@@ -79,6 +80,21 @@ struct fsl_usb2_platform_data {
        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 */