2 files changed, 16 insertions, 2 deletions

diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index f620e3546eaf..7a2c217fb150 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -64,6 +64,7 @@
 #include <linux/of.h>
 #include <linux/phy.h>
 #include <linux/regulator/consumer.h>
+#include <linux/usb/ehci_def.h>
 
 #include "ci.h"
 #include "udc.h"
@@ -412,7 +413,17 @@ static int ci_usb_phy_init(struct ci_hdrc *ci)
  */
 void ci_platform_configure(struct ci_hdrc *ci)
 {
-        if (ci->platdata->flags & CI_HDRC_DISABLE_STREAMING)
+        bool is_device_mode, is_host_mode;
+
+        is_device_mode = hw_read(ci, OP_USBMODE, USBMODE_CM) == USBMODE_CM_DC;
+        is_host_mode = hw_read(ci, OP_USBMODE, USBMODE_CM) == USBMODE_CM_HC;
+
+        if (is_device_mode &&
+                (ci->platdata->flags & CI_HDRC_DISABLE_DEVICE_STREAMING))
+                hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);
+
+        if (is_host_mode &&
+                (ci->platdata->flags & CI_HDRC_DISABLE_HOST_STREAMING))
                 hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);
 
         if (ci->platdata->flags & CI_HDRC_FORCE_FULLSPEED) {
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index 1c5d7763990a..4d34a8612e85 100644
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -19,8 +19,11 @@ struct ci_hdrc_platform_data {
         enum usb_phy_interface phy_mode;
         unsigned long    flags;
 #define CI_HDRC_REGS_SHARED             BIT(0)
+#define CI_HDRC_DISABLE_DEVICE_STREAMING        BIT(1)
 #define CI_HDRC_SUPPORTS_RUNTIME_PM     BIT(2)
-#define CI_HDRC_DISABLE_STREAMING       BIT(3)
+#define CI_HDRC_DISABLE_HOST_STREAMING  BIT(3)
+#define CI_HDRC_DISABLE_STREAMING (CI_HDRC_DISABLE_DEVICE_STREAMING |   \
+                CI_HDRC_DISABLE_HOST_STREAMING)
         /*
          * Only set it when DCCPARAMS.DC==1 and DCCPARAMS.HC==1,
          * but otg is not supported (no register otgsc).