Revert "usb: dwc3: Decouple USB 2.0 L1 & L2 events"
This reverts commit 6b3af2ad53cfe8a625f0e77b69c2b5ef685787d0 which is
commit 843714bb37d9a3780160d7b4a4a72b8077a77589 upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.
Bug: 161946584
Change-Id: Ib96ea8055f2104af87ae69497c0a4ee84b7df024
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index f039f39..38dc9b4 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1067,15 +1067,6 @@ static int dwc3_core_init(struct dwc3 *dwc)
if (!DWC3_VER_IS_PRIOR(DWC3, 290A))
reg |= DWC3_GUCTL1_DEV_L1_EXIT_BY_HW;
- /*
- * Decouple USB 2.0 L1 & L2 events which will allow for
- * gadget driver to only receive U3/L2 suspend & wakeup
- * events and prevent the more frequent L1 LPM transitions
- * from interrupting the driver.
- */
- if (!DWC3_VER_IS_PRIOR(DWC3, 300A))
- reg |= DWC3_GUCTL1_DEV_DECOUPLE_L1L2_EVT;
-
if (dwc->dis_tx_ipgap_linecheck_quirk)
reg |= DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS;
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 7d0d693..6e11f69 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -254,11 +254,10 @@
#define DWC3_GCTL_DSBLCLKGTNG BIT(0)
/* Global User Control 1 Register */
-#define DWC3_GUCTL1_DEV_DECOUPLE_L1L2_EVT BIT(31)
+#define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17)
#define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS BIT(28)
#define DWC3_GUCTL1_DEV_FORCE_20_CLK_FOR_30_CLK BIT(26)
-#define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW BIT(24)
-#define DWC3_GUCTL1_PARKMODE_DISABLE_SS BIT(17)
+#define DWC3_GUCTL1_DEV_L1_EXIT_BY_HW BIT(24)
/* Global Status Register */
#define DWC3_GSTS_OTG_IP BIT(10)
