powerpc, 8260: remove support for mpc8260

[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 f038747e63e0d5175bb58ee495b7e419140d8c98..f3207084314991e52cd4947b8c785abefbe2c8cb 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
@@ -91,12 +91,6 @@
 #define gadget_is_atmel_usba(g)        0
 #endif
 
-#ifdef CONFIG_USB_GADGET_S3C2410
-#define gadget_is_s3c2410(g)    (!strcmp("s3c2410_udc", (g)->name))
-#else
-#define gadget_is_s3c2410(g)    0
-#endif
-
 #ifdef CONFIG_USB_GADGET_AT91
 #define gadget_is_at91(g)      (!strcmp("at91_udc", (g)->name))
 #else
@@ -125,29 +119,22 @@
 #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
 #endif
 
-/* from Montavista kernel (?) */
-#ifdef CONFIG_USB_GADGET_MPC8272
-#define gadget_is_mpc8272(g)   (!strcmp("mpc8272_udc", (g)->name))
-#else
-#define gadget_is_mpc8272(g)   0
-#endif
-
 #ifdef CONFIG_USB_GADGET_M66592
 #define        gadget_is_m66592(g)     (!strcmp("m66592_udc", (g)->name))
 #else
 #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
@@ -156,6 +143,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
@@ -199,8 +194,6 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
                return 0x09;
        else if (gadget_is_pxa27x(gadget))
                return 0x10;
-       else if (gadget_is_s3c2410(gadget))
-               return 0x11;
        else if (gadget_is_at91(gadget))
                return 0x12;
        else if (gadget_is_imx(gadget))
@@ -209,8 +202,6 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget)
                return 0x14;
        else if (gadget_is_musbhdrc(gadget))
                return 0x15;
-       else if (gadget_is_mpc8272(gadget))
-               return 0x16;
        else if (gadget_is_atmel_usba(gadget))
                return 0x17;
        else if (gadget_is_fsl_usb2(gadget))
@@ -219,7 +210,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;