Prepare v2023.10

[platform/kernel/u-boot.git] / drivers / usb / gadget / gadget_chips.h

diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 0cdf47c..98156c3 100644 (file)
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -32,12 +32,6 @@
 #define        gadget_is_dummy(g)      0
 #endif
 
-#ifdef CONFIG_USB_GADGET_PXA2XX
-#define        gadget_is_pxa(g)        (!strcmp("pxa2xx_udc", (g)->name))
-#else
-#define        gadget_is_pxa(g)        0
-#endif
-
 #ifdef CONFIG_USB_GADGET_GOKU
 #define        gadget_is_goku(g)       (!strcmp("goku_udc", (g)->name))
 #else
@@ -51,13 +45,6 @@
 #define        gadget_is_sh(g)         0
 #endif
 
-/* not yet stable on 2.6 (would help "original Zaurus") */
-#ifdef CONFIG_USB_GADGET_SA1100
-#define        gadget_is_sa1100(g)     (!strcmp("sa1100_udc", (g)->name))
-#else
-#define        gadget_is_sa1100(g)     0
-#endif
-
 /* handhelds.org tree (?) */
 #ifdef CONFIG_USB_GADGET_MQ11XX
 #define        gadget_is_mq11xx(g)     (!strcmp("mq11xx_udc", (g)->name))
@@ -78,13 +65,6 @@
 #define        gadget_is_n9604(g)      0
 #endif
 
-/* various unstable versions available */
-#ifdef CONFIG_USB_GADGET_PXA27X
-#define        gadget_is_pxa27x(g)     (!strcmp("pxa27x_udc", (g)->name))
-#else
-#define        gadget_is_pxa27x(g)     0
-#endif
-
 #ifdef CONFIG_USB_GADGET_ATMEL_USBA
 #define gadget_is_atmel_usba(g)        (!strcmp("atmel_usba_udc", (g)->name))
 #else
@@ -137,12 +117,6 @@
 #define gadget_is_ci(g)        0
 #endif
 
-#ifdef CONFIG_USB_GADGET_FOTG210
-#define gadget_is_fotg210(g)        (!strcmp("fotg210_udc", (g)->name))
-#else
-#define gadget_is_fotg210(g)        0
-#endif
-
 #ifdef CONFIG_USB_DWC3_GADGET
 #define gadget_is_dwc3(g)        (!strcmp("dwc3-gadget", (g)->name))
 #else
@@ -167,6 +141,12 @@
 #define gadget_is_mtu3(g)        0
 #endif
 
+#ifdef CONFIG_USB_GADGET_DWC2_OTG
+#define gadget_is_dwc2(g)        (!strcmp("dwc2-udc", (g)->name))
+#else
+#define gadget_is_dwc2(g)        0
+#endif
+
 /**
  * usb_gadget_controller_number - support bcdDevice id convention
  * @gadget: the controller being driven
@@ -188,12 +168,8 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
                return 0x01;
        else if (gadget_is_dummy(gadget))
                return 0x02;
-       else if (gadget_is_pxa(gadget))
-               return 0x03;
        else if (gadget_is_sh(gadget))
                return 0x04;
-       else if (gadget_is_sa1100(gadget))
-               return 0x05;
        else if (gadget_is_goku(gadget))
                return 0x06;
        else if (gadget_is_mq11xx(gadget))
@@ -202,8 +178,6 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
                return 0x08;
        else if (gadget_is_n9604(gadget))
                return 0x09;
-       else if (gadget_is_pxa27x(gadget))
-               return 0x10;
        else if (gadget_is_at91(gadget))
                return 0x12;
        else if (gadget_is_imx(gadget))
@@ -222,8 +196,6 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
                return 0x20;
        else if (gadget_is_ci(gadget))
                return 0x21;
-       else if (gadget_is_fotg210(gadget))
-               return 0x22;
        else if (gadget_is_dwc3(gadget))
                return 0x23;
        else if (gadget_is_cdns3(gadget))
@@ -232,5 +204,7 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
                return 0x25;
        else if (gadget_is_mtu3(gadget))
                return 0x26;
+       else if (gadget_is_dwc2(gadget))
+               return 0x27;
        return -ENOENT;
 }