usb: gadget: g_dnl: hold maximum string descriptor

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

diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index aa54b8547e73d2945a9b5d8df5486c87ec73f3bc..973cd971ad19a0195dc8b6f18c9ab4fdcfcc5b3d 100644 (file)
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -11,7 +11,7 @@
  * Some are available on 2.4 kernels; several are available, but not
  * yet pushed in the 2.6 mainline tree.
  *
- * Ported to U-boot by: Thomas Smits <ts.smits@gmail.com> and
+ * Ported to U-Boot by: Thomas Smits <ts.smits@gmail.com> and
  *                      Remy Bohmer <linux@bohmer.net>
  */
 #ifdef CONFIG_USB_GADGET_NET2280
@@ -125,7 +125,7 @@
 #endif
 
 /* Mentor high speed "dual role" controller, in peripheral role */
-#ifdef CONFIG_MUSB_GADGET
+#ifdef CONFIG_USB_MUSB_GADGET
 #define gadget_is_musbhdrc(g)  (!strcmp("musb-hdrc", (g)->name))
 #else
 #define gadget_is_musbhdrc(g)  0
@@ -144,10 +144,10 @@
 #define        gadget_is_m66592(g)     0
 #endif
 
-#ifdef CONFIG_MV_UDC
-#define gadget_is_mv(g)        (!strcmp("mv_udc", (g)->name))
+#ifdef CONFIG_CI_UDC
+#define gadget_is_ci(g)        (!strcmp("ci_udc", (g)->name))
 #else
-#define gadget_is_mv(g)        0
+#define gadget_is_ci(g)        0
 #endif
 
 #ifdef CONFIG_USB_GADGET_FOTG210
@@ -156,6 +156,14 @@
 #define gadget_is_fotg210(g)        0
 #endif
 
+#ifdef CONFIG_USB_DWC3_GADGET
+#define gadget_is_dwc3(g)        (!strcmp("dwc3-gadget", (g)->name))
+#else
+#define gadget_is_dwc3(g)        0
+#endif
+
+
+
 /*
  * CONFIG_USB_GADGET_SX2
  * CONFIG_USB_GADGET_AU1X00
@@ -219,7 +227,7 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
                return 0x19;
        else if (gadget_is_m66592(gadget))
                return 0x20;
-       else if (gadget_is_mv(gadget))
+       else if (gadget_is_ci(gadget))
                return 0x21;
        else if (gadget_is_fotg210(gadget))
                return 0x22;