Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3a3d28f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-4.0-rc6' of... 

Merge tag 'usb-serial-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for v4.0-rc6

Here are a few new device IDs.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents baf7a6c7 b229a0f8

drivers/usb/serial/ftdi_sio.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -604,6 +604,7 @@ static const struct usb_device_id id_table_combined[] = { 
		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID),

	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) },

	/*

	/*

	 * ELV devices:

	 * ELV devices:

	 */

	 */
@@ -1883,8 +1884,12 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial) 
{

{

	struct usb_device *udev = serial->dev;

	struct usb_device *udev = serial->dev;





	if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) ||

	if (udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems"))

	    (udev->product && !strcmp(udev->product, "BeagleBone/XDS100V2")))

		return ftdi_jtag_probe(serial);



	if (udev->product &&

		(!strcmp(udev->product, "BeagleBone/XDS100V2") ||

		 !strcmp(udev->product, "SNAP Connect E10")))

		return ftdi_jtag_probe(serial);

		return ftdi_jtag_probe(serial);





	return 0;

	return 0;

drivers/usb/serial/ftdi_sio_ids.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -561,6 +561,12 @@ 
 */

 */

#define FTDI_NT_ORIONLXM_PID	0x7c90	/* OrionLXm Substation Automation Platform */

#define FTDI_NT_ORIONLXM_PID	0x7c90	/* OrionLXm Substation Automation Platform */





/*

 * Synapse Wireless product ids (FTDI_VID)

 * http://www.synapse-wireless.com

 */

#define FTDI_SYNAPSE_SS200_PID 0x9090 /* SS200 - SNAP Stick 200 */







/********************************/

/********************************/

/** third-party VID/PID combos **/

/** third-party VID/PID combos **/

drivers/usb/serial/keyspan_pda.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -61,6 +61,7 @@ struct keyspan_pda_private { 
/* For Xircom PGSDB9 and older Entrega version of the same device */

/* For Xircom PGSDB9 and older Entrega version of the same device */

#define XIRCOM_VENDOR_ID		0x085a

#define XIRCOM_VENDOR_ID		0x085a

#define XIRCOM_FAKE_ID			0x8027

#define XIRCOM_FAKE_ID			0x8027

#define XIRCOM_FAKE_ID_2		0x8025 /* "PGMFHUB" serial */

#define ENTREGA_VENDOR_ID		0x1645

#define ENTREGA_VENDOR_ID		0x1645

#define ENTREGA_FAKE_ID			0x8093

#define ENTREGA_FAKE_ID			0x8093
@@ -70,6 +71,7 @@ static const struct usb_device_id id_table_combined[] = { 
#endif

#endif

#ifdef XIRCOM

#ifdef XIRCOM

	{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },

	{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },

	{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID_2) },

	{ USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },

	{ USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },

#endif

#endif

	{ USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) },

	{ USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) },
@@ -93,6 +95,7 @@ static const struct usb_device_id id_table_fake[] = { 
#ifdef XIRCOM

#ifdef XIRCOM

static const struct usb_device_id id_table_fake_xircom[] = {

static const struct usb_device_id id_table_fake_xircom[] = {

	{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },

	{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },

	{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID_2) },

	{ USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },

	{ USB_DEVICE(ENTREGA_VENDOR_ID, ENTREGA_FAKE_ID) },

	{ }

	{ }

};

};