usb: dwc3: Check for USB4 IP_NAME

commit 0ed91d47959cb7573c17e06487f0fb891d59dfb3 upstream.

Synopsys renamed DWC_usb32 IP to DWC_usb4 as of IP version 1.30. No
functional change except checking for the IP_NAME here. The driver will
treat the new IP_NAME as if it's DWC_usb32. Additional features for USB4
will be introduced and checked separately.

Cc: stable@vger.kernel.org
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Link: https://patch.msgid.link/e6f1827754c7a7ddc5eb7382add20bfe3a9b312f.1767390747.git.Thinh.Nguyen@synopsys.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index c2ce2f5e60a19ce207551ef7681737fd9e91a70a..eb10490a6d92ca83a1d19a07c75feeb88f7f68ed 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -991,6 +991,8 @@ static bool dwc3_core_is_valid(struct dwc3 *dwc)
 
        reg = dwc3_readl(dwc->regs, 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)) {

diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index a5fc92c4ffa3bc280960e81594ae5cfb401f233a..45757169b672fd04f3004f5b0b4588317b661732 100644 (file)
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -1265,6 +1265,7 @@ struct dwc3 {
 #define DWC3_IP                        0x5533
 #define DWC31_IP               0x3331
 #define DWC32_IP               0x3332
+#define DWC4_IP                        0x3430
 
        u32                     revision;