Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / gadget_chips.h

diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h
index 17d9905101b75a9ebc082b92c9fe00ade4c34f84..4e3107dd2f345af58d5c57767a49871a21e5e4bd 100644 (file)
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -151,6 +151,13 @@
 #define        gadget_is_m66592(g)     0
 #endif
 
+/* Freescale CPM/QE UDC SUPPORT */
+#ifdef CONFIG_USB_GADGET_FSL_QE
+#define gadget_is_fsl_qe(g)    !strcmp("fsl_qe_udc", (g)->name)
+#else
+#define gadget_is_fsl_qe(g)    0
+#endif
+
 
 // CONFIG_USB_GADGET_SX2
 // CONFIG_USB_GADGET_AU1X00
@@ -216,6 +223,8 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
                return 0x20;
        else if (gadget_is_m66592(gadget))
                return 0x21;
+       else if (gadget_is_fsl_qe(gadget))
+               return 0x22;
        return -ENOENT;
 }