diff options
| author | Li Yang <leoli@freescale.com> | 2007-04-23 10:37:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-04-27 13:28:43 -0700 |
| commit | d2eef1fc99640f7de302dcdbcfbdfcec2eef13f6 (patch) | |
| tree | eef9d46f61e44c9a8eafda30b5ad72aa4d99ad79 /drivers/usb/gadget | |
| parent | b504882da539c17ce6fee9da2a97f2fafabd495d (diff) | |
| download | kernel_samsung_aries-d2eef1fc99640f7de302dcdbcfbdfcec2eef13f6.zip kernel_samsung_aries-d2eef1fc99640f7de302dcdbcfbdfcec2eef13f6.tar.gz kernel_samsung_aries-d2eef1fc99640f7de302dcdbcfbdfcec2eef13f6.tar.bz2 | |
USB: update gadget files for fsl_usb2_udc driver
Update gadget_chip.c, ether.c for newly added Freescale Highspeed USB
device driver.
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/ether.c | 3 | ||||
| -rw-r--r-- | drivers/usb/gadget/gadget_chips.h | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 96df841..1dd8b57 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -282,6 +282,9 @@ MODULE_PARM_DESC(host_addr, "Host Ethernet Address"); #define DEV_CONFIG_CDC #endif +#ifdef CONFIG_USB_GADGET_FSL_USB2 +#define DEV_CONFIG_CDC +#endif /* For CDC-incapable hardware, choose the simple cdc subset. * Anything that talks bulk (without notable bugs) can do this. diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/gadget_chips.h index 2e3d662..d041b91 100644 --- a/drivers/usb/gadget/gadget_chips.h +++ b/drivers/usb/gadget/gadget_chips.h @@ -99,6 +99,12 @@ #define gadget_is_imx(g) 0 #endif +#ifdef CONFIG_USB_GADGET_FSL_USB2 +#define gadget_is_fsl_usb2(g) !strcmp("fsl-usb2-udc", (g)->name) +#else +#define gadget_is_fsl_usb2(g) 0 +#endif + /* Mentor high speed function controller */ #ifdef CONFIG_USB_GADGET_MUSBHSFC #define gadget_is_musbhsfc(g) !strcmp("musbhsfc_udc", (g)->name) @@ -177,5 +183,7 @@ static inline int usb_gadget_controller_number(struct usb_gadget *gadget) return 0x17; else if (gadget_is_husb2dev(gadget)) return 0x18; + else if (gadget_is_fsl_usb2(gadget)) + return 0x19; return -ENOENT; } |