]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge 6.19-rc6 usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jan 2026 09:24:11 +0000 (10:24 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jan 2026 09:24:11 +0000 (10:24 +0100)
We need the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/usb/dwc3/core.c
drivers/usb/dwc3/core.h
drivers/usb/typec/tcpm/tcpm.c

diff --cc MAINTAINERS
Simple merge
index 670a9d4bfff24e35710742b07d6794407da5d29c,93fd5fdf95cb1daec32089d2fb98e6f0346228d0..f32b67bf73a4555a8b4ff89b2fde8b19851f8724
@@@ -991,8 -991,10 +991,10 @@@ static bool dwc3_core_is_valid(struct d
  {
        u32 reg;
  
 -      reg = dwc3_readl(dwc->regs, DWC3_GSNPSID);
 +      reg = dwc3_readl(dwc, DWC3_GSNPSID);
        dwc->ip = DWC3_GSNPS_ID(reg);
+       if (dwc->ip == DWC4_IP)
+               dwc->ip = DWC32_IP;
  
        /* This should read as U3 followed by revision number */
        if (DWC3_IP_IS(DWC3)) {
Simple merge
Simple merge