From: Dom Cobley <popcornmix@gmail.com>
Date: Fri, 11 Nov 2022 12:18:21 +0000 (+0000)
Subject: Merge remote-tracking branch 'stable/linux-5.15.y' into rpi-5.15.y
X-Git-Tag: accepted/tizen/unified/20230118.172025~280
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31bf7119c2a66c2d198386bb92bd9a421c9fd394;p=platform%2Fkernel%2Flinux-rpi.git

Merge remote-tracking branch 'stable/linux-5.15.y' into rpi-5.15.y
---

31bf7119c2a66c2d198386bb92bd9a421c9fd394
diff --cc drivers/usb/host/xhci.h
index 209c828,d3c0766..cb3c4fd
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -1905,9 -1904,7 +1905,10 @@@ struct xhci_hcd 
  #define XHCI_BROKEN_D3COLD	BIT_ULL(41)
  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(42)
  #define XHCI_SUSPEND_RESUME_CLKS	BIT_ULL(43)
- #define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(44)
- #define XHCI_VLI_TRB_CACHE_BUG	BIT_ULL(45)
- #define XHCI_VLI_SS_BULK_OUT_BUG	BIT_ULL(46)
+ #define XHCI_RESET_TO_DEFAULT	BIT_ULL(44)
++#define XHCI_AVOID_DQ_ON_LINK	BIT_ULL(45)
++#define XHCI_VLI_TRB_CACHE_BUG	BIT_ULL(46)
++#define XHCI_VLI_SS_BULK_OUT_BUG	BIT_ULL(47)
  
  	unsigned int		num_active_eps;
  	unsigned int		limit_active_eps;