diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-15 22:14:41 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-15 22:14:41 (GMT) |
| commit | f242bbc598b96f58ca4caf416cabe3ac01e8b2ab (patch) | |
| tree | 118b7d94f2b2c5486212f80e0ea060dd90de1044 /drivers/usb/class/cdc-acm.c | |
| parent | ddf5a25c5fdd4cc276edf451871c38002eec0f95 (diff) | |
| parent | 02a551c9755b799579e0a093bcc99b80b4dc1453 (diff) | |
| download | linux-fsl-qoriq-f242bbc598b96f58ca4caf416cabe3ac01e8b2ab.tar.xz | |
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
USB: option: Removing one bogus and adding some new Huawei combinations
USB: cdc-acm: add IDs for Motorola H24 HSPA USB module.
usb: option: Add Huawei E398 controlling interfaces
usb: renesas_usbhs: add hcd->has_tt for low/full speed
usb: renesas_usbhs: typofix: irq_dtch control DTCHE
usb: gadget: storage: release superspeed descriptors.
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index e8c564a..a8078d0 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1458,6 +1458,16 @@ static const struct usb_device_id acm_ids[] = { }, { USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */ }, + /* Motorola H24 HSPA module: */ + { USB_DEVICE(0x22b8, 0x2d91) }, /* modem */ + { USB_DEVICE(0x22b8, 0x2d92) }, /* modem + diagnostics */ + { USB_DEVICE(0x22b8, 0x2d93) }, /* modem + AT port */ + { USB_DEVICE(0x22b8, 0x2d95) }, /* modem + AT port + diagnostics */ + { USB_DEVICE(0x22b8, 0x2d96) }, /* modem + NMEA */ + { USB_DEVICE(0x22b8, 0x2d97) }, /* modem + diagnostics + NMEA */ + { USB_DEVICE(0x22b8, 0x2d99) }, /* modem + AT port + NMEA */ + { USB_DEVICE(0x22b8, 0x2d9a) }, /* modem + AT port + diagnostics + NMEA */ + { USB_DEVICE(0x0572, 0x1329), /* Hummingbird huc56s (Conexant) */ .driver_info = NO_UNION_NORMAL, /* union descriptor misplaced on data interface instead of |