Merge branch 'master' of git://git.denx.de/u-boot-video

[oweals/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 02cae0fc7586134cb8ba5ca07bba640b336a95b6..cc94771e32fc40648b097b6978e229904db20c99 100644 (file)
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -125,8 +125,8 @@
 #endif
 
 /* Mentor high speed "dual role" controller, in peripheral role */
-#ifdef CONFIG_USB_GADGET_MUSB_HDRC
-#define gadget_is_musbhdrc(g)  (!strcmp("musb_hdrc", (g)->name))
+#ifdef CONFIG_MUSB_GADGET
+#define gadget_is_musbhdrc(g)  (!strcmp("musb-hdrc", (g)->name))
 #else
 #define gadget_is_musbhdrc(g)  0
 #endif
@@ -144,10 +144,16 @@
 #define        gadget_is_m66592(g)     0
 #endif
 
-#ifdef CONFIG_USB_GADGET_MV
-#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
+#define gadget_is_fotg210(g)        (!strcmp("fotg210_udc", (g)->name))
+#else
+#define gadget_is_fotg210(g)        0
 #endif
 
 /*
@@ -213,7 +219,9 @@ 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;
        return -ENOENT;
 }