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 5246e8fef2b276b28d5e64095fa77493eae91232..4e3107dd2f345af58d5c57767a49871a21e5e4bd 100644 (file)
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/gadget_chips.h
@@ -11,6 +11,10 @@
  * Some are available on 2.4 kernels; several are available, but not
  * yet pushed in the 2.6 mainline tree.
  */
+
+#ifndef __GADGET_CHIPS_H
+#define __GADGET_CHIPS_H
+
 #ifdef CONFIG_USB_GADGET_NET2280
 #define        gadget_is_net2280(g)    !strcmp("net2280", (g)->name)
 #else
@@ -147,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
@@ -212,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;
 }
 
@@ -237,3 +250,5 @@ static inline bool gadget_supports_altsettings(struct usb_gadget *gadget)
        /* Everything else is *presumably* fine ... */
        return true;
 }
+
+#endif /* __GADGET_CHIPS_H */