diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 19:41:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 19:41:46 +0100 |
| commit | 9f10adc54450e246bbbb63cd152a941873068567 (patch) | |
| tree | 87a70488a65c767d6af2da28b00995273a53acc1 /drivers/usb/serial/usb-serial-simple.c | |
| parent | usb: chipidea: Fixed a few typos in comments (diff) | |
| parent | USB: qcserial: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem (diff) | |
| download | linux-9f10adc54450e246bbbb63cd152a941873068567.tar.xz linux-9f10adc54450e246bbbb63cd152a941873068567.zip | |
Merge tag 'usb-serial-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial updates for v3.19-rc1
These changes add a new "simple" driver for Google USB-serial
devices and add support for Huawei Gobi modems to qcserial.
Included are also some removals of unnecessary atomic allocations and
a few spelling fixes.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/usb-serial-simple.c')
| -rw-r--r-- | drivers/usb/serial/usb-serial-simple.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c index 7064eb8d6142..bc310112eae9 100644 --- a/drivers/usb/serial/usb-serial-simple.c +++ b/drivers/usb/serial/usb-serial-simple.c @@ -56,6 +56,14 @@ DEVICE(funsoft, FUNSOFT_IDS); { USB_DEVICE(0x8087, 0x0716) } DEVICE(flashloader, FLASHLOADER_IDS); +/* Google Serial USB SubClass */ +#define GOOGLE_IDS() \ + { USB_VENDOR_AND_INTERFACE_INFO(0x18d1, \ + USB_CLASS_VENDOR_SPEC, \ + 0x50, \ + 0x01) } +DEVICE(google, GOOGLE_IDS); + /* ViVOpay USB Serial Driver */ #define VIVOPAY_IDS() \ { USB_DEVICE(0x1d5f, 0x1004) } /* ViVOpay 8800 */ @@ -97,6 +105,7 @@ static struct usb_serial_driver * const serial_drivers[] = { &zio_device, &funsoft_device, &flashloader_device, + &google_device, &vivopay_device, &moto_modem_device, &novatel_gps_device, @@ -111,6 +120,7 @@ static const struct usb_device_id id_table[] = { ZIO_IDS(), FUNSOFT_IDS(), FLASHLOADER_IDS(), + GOOGLE_IDS(), VIVOPAY_IDS(), MOTO_IDS(), NOVATEL_IDS(), |