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

Commit 7fea0f71 authored by Sebastien Bourdeauducq's avatar Sebastien Bourdeauducq Committed by Greg Kroah-Hartman
Browse files

USB: ftdi_sio: add device IDs for Milkymist One JTAG/serial 

Add the USB IDs for the Milkymist One FTDI-based JTAG/serial adapter
(http://projects.qi-hardware.com/index.php/p/mmone-jtag-serial-cable/

)
to the ftdi_sio driver and disable the first serial channel (used as
JTAG from userspace).

Signed-off-by: default avatarSebastien Bourdeauducq <sebastien@milkymist.org>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a91be2ac

drivers/usb/serial/ftdi_sio.c

+2 −0
Original line number Diff line number Diff line
@@ -794,6 +794,8 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },

	{ USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ },					/* Optional parameter entry */

	{ }					/* Terminating entry */

};

drivers/usb/serial/ftdi_sio_ids.h

+7 −0
Original line number Diff line number Diff line
@@ -1100,3 +1100,10 @@ 
#define FTDI_SCIENCESCOPE_LOGBOOKML_PID		0xFF18

#define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID	0xFF1C

#define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID	0xFF1D



/*

 * Milkymist One JTAG/Serial

 */

#define QIHARDWARE_VID			0x20B7

#define MILKYMISTONE_JTAGSERIAL_PID	0x0713