![Linus Torvalds](/assets/img/avatar_default.png)
Here's the big set of USB and PHY patches for 3.19-rc1. The normal churn in the USB gadget area is in here, as well as xhci and other individual USB driver updates. The PHY tree is also in here, as there were dependancies on the USB tree. All of these have been in linux-next. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlSOEHcACgkQMUfUDdst+ykziQCgsm1D/af2nac6CTF2pov8VMIY ywgAnRi8LtZ2WassrwTNxY86Avaqryis =UVp8 -----END PGP SIGNATURE----- Merge tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB updates from Greg KH: "Here's the big set of USB and PHY patches for 3.19-rc1. The normal churn in the USB gadget area is in here, as well as xhci and other individual USB driver updates. The PHY tree is also in here, as there were dependancies on the USB tree. All of these have been in linux-next" * tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (351 commits) arm: omap3: twl: remove usb phy init data usbip: fix error handling in stub_probe() usb: gadget: udc: missing curly braces USB: mos7720: delete some unneeded code wusb: replace memset by memzero_explicit usbip: remove unneeded structure usb: xhci: fix comment for PORT_DEV_REMOVE xhci: don't use the same variable for stopped and halted rings current TD xhci: clear extra bits from slot context when setting max exit latency xhci: cleanup finish_td function USB: adutux: NULL dereferences on disconnect usb: chipidea: fix platform_no_drv_owner.cocci warnings usb: chipidea: Fixed a few typos in comments Documentation: bindings: add doc for the USB2 ChipIdea USB driver usb: chipidea: add a usb2 driver for ci13xxx usb: chipidea: fix phy handling usb: chipidea: remove duplicate dev_set_drvdata for host_start usb: chipidea: parameter 'mode' isn't needed for hw_device_reset usb: chipidea: add controller reset API usb: chipidea: remove flag CI_HDRC_REQUIRE_TRANSCEIVER ...
136 lines
3.6 KiB
C
136 lines
3.6 KiB
C
/*
|
|
* USB Serial "Simple" driver
|
|
*
|
|
* Copyright (C) 2001-2006,2008,2013 Greg Kroah-Hartman <greg@kroah.com>
|
|
* Copyright (C) 2005 Arthur Huillet (ahuillet@users.sf.net)
|
|
* Copyright (C) 2005 Thomas Hergenhahn <thomas.hergenhahn@suse.de>
|
|
* Copyright (C) 2009 Outpost Embedded, LLC
|
|
* Copyright (C) 2010 Zilogic Systems <code@zilogic.com>
|
|
* Copyright (C) 2013 Wei Shuai <cpuwolf@gmail.com>
|
|
* Copyright (C) 2013 Linux Foundation
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License version
|
|
* 2 as published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/tty.h>
|
|
#include <linux/module.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/usb/serial.h>
|
|
|
|
#define DEVICE_N(vendor, IDS, nport) \
|
|
static const struct usb_device_id vendor##_id_table[] = { \
|
|
IDS(), \
|
|
{ }, \
|
|
}; \
|
|
static struct usb_serial_driver vendor##_device = { \
|
|
.driver = { \
|
|
.owner = THIS_MODULE, \
|
|
.name = #vendor, \
|
|
}, \
|
|
.id_table = vendor##_id_table, \
|
|
.num_ports = nport, \
|
|
};
|
|
|
|
#define DEVICE(vendor, IDS) DEVICE_N(vendor, IDS, 1)
|
|
|
|
/* Medtronic CareLink USB driver */
|
|
#define CARELINK_IDS() \
|
|
{ USB_DEVICE(0x0a21, 0x8001) } /* MMT-7305WW */
|
|
DEVICE(carelink, CARELINK_IDS);
|
|
|
|
/* ZIO Motherboard USB driver */
|
|
#define ZIO_IDS() \
|
|
{ USB_DEVICE(0x1CBE, 0x0103) }
|
|
DEVICE(zio, ZIO_IDS);
|
|
|
|
/* Funsoft Serial USB driver */
|
|
#define FUNSOFT_IDS() \
|
|
{ USB_DEVICE(0x1404, 0xcddc) }
|
|
DEVICE(funsoft, FUNSOFT_IDS);
|
|
|
|
/* Infineon Flashloader driver */
|
|
#define FLASHLOADER_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 */
|
|
DEVICE(vivopay, VIVOPAY_IDS);
|
|
|
|
/* Motorola USB Phone driver */
|
|
#define MOTO_IDS() \
|
|
{ USB_DEVICE(0x05c6, 0x3197) }, /* unknown Motorola phone */ \
|
|
{ USB_DEVICE(0x0c44, 0x0022) }, /* unknown Motorola phone */ \
|
|
{ USB_DEVICE(0x22b8, 0x2a64) }, /* Motorola KRZR K1m */ \
|
|
{ USB_DEVICE(0x22b8, 0x2c84) }, /* Motorola VE240 phone */ \
|
|
{ USB_DEVICE(0x22b8, 0x2c64) } /* Motorola V950 phone */
|
|
DEVICE(moto_modem, MOTO_IDS);
|
|
|
|
/* Novatel Wireless GPS driver */
|
|
#define NOVATEL_IDS() \
|
|
{ USB_DEVICE(0x09d7, 0x0100) } /* NovAtel FlexPack GPS */
|
|
DEVICE_N(novatel_gps, NOVATEL_IDS, 3);
|
|
|
|
/* HP4x (48/49) Generic Serial driver */
|
|
#define HP4X_IDS() \
|
|
{ USB_DEVICE(0x03f0, 0x0121) }
|
|
DEVICE(hp4x, HP4X_IDS);
|
|
|
|
/* Suunto ANT+ USB Driver */
|
|
#define SUUNTO_IDS() \
|
|
{ USB_DEVICE(0x0fcf, 0x1008) }, \
|
|
{ USB_DEVICE(0x0fcf, 0x1009) } /* Dynastream ANT USB-m Stick */
|
|
DEVICE(suunto, SUUNTO_IDS);
|
|
|
|
/* Siemens USB/MPI adapter */
|
|
#define SIEMENS_IDS() \
|
|
{ USB_DEVICE(0x908, 0x0004) }
|
|
DEVICE(siemens_mpi, SIEMENS_IDS);
|
|
|
|
/* All of the above structures mushed into two lists */
|
|
static struct usb_serial_driver * const serial_drivers[] = {
|
|
&carelink_device,
|
|
&zio_device,
|
|
&funsoft_device,
|
|
&flashloader_device,
|
|
&google_device,
|
|
&vivopay_device,
|
|
&moto_modem_device,
|
|
&novatel_gps_device,
|
|
&hp4x_device,
|
|
&suunto_device,
|
|
&siemens_mpi_device,
|
|
NULL
|
|
};
|
|
|
|
static const struct usb_device_id id_table[] = {
|
|
CARELINK_IDS(),
|
|
ZIO_IDS(),
|
|
FUNSOFT_IDS(),
|
|
FLASHLOADER_IDS(),
|
|
GOOGLE_IDS(),
|
|
VIVOPAY_IDS(),
|
|
MOTO_IDS(),
|
|
NOVATEL_IDS(),
|
|
HP4X_IDS(),
|
|
SUUNTO_IDS(),
|
|
SIEMENS_IDS(),
|
|
{ },
|
|
};
|
|
MODULE_DEVICE_TABLE(usb, id_table);
|
|
|
|
module_usb_serial_driver(serial_drivers, id_table);
|
|
MODULE_LICENSE("GPL");
|