Merge tag 'jfs-4.1' of git://github.com/kleikamp/linux-shaggy

[firefly-linux-kernel-4.4.55.git] / include / linux / usb / chipidea.h

diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index 535997a6681b90318e37e9fcabc5e4ecae22109b..ab94f78c4dd15ee4554a4eff996c862b7a6fd869 100644 (file)
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -19,6 +19,7 @@ struct ci_hdrc_platform_data {
        enum usb_phy_interface phy_mode;
        unsigned long    flags;
 #define CI_HDRC_REGS_SHARED            BIT(0)
+#define CI_HDRC_SUPPORTS_RUNTIME_PM    BIT(2)
 #define CI_HDRC_DISABLE_STREAMING      BIT(3)
        /*
         * Only set it when DCCPARAMS.DC==1 and DCCPARAMS.HC==1,
@@ -27,6 +28,7 @@ struct ci_hdrc_platform_data {
 #define CI_HDRC_DUAL_ROLE_NOT_OTG      BIT(4)
 #define CI_HDRC_IMX28_WRITE_FIX                BIT(5)
 #define CI_HDRC_FORCE_FULLSPEED                BIT(6)
+#define CI_HDRC_TURN_VBUS_EARLY_ON     BIT(7)
        enum usb_dr_mode        dr_mode;
 #define CI_HDRC_CONTROLLER_RESET_EVENT         0
 #define CI_HDRC_CONTROLLER_STOPPED_EVENT       1