Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7fea0f714ffb3f303d4b66933af2df2f5584c9bf

Authored by Sebastien Bourdeauducq
Committed by Greg Kroah-Hartman
1 parent a91be2acc6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Sebastien Bourdeauducq <sebastien@milkymist.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 2 changed files with 9 additions and 0 deletions Side-by-side Diff

drivers/usb/serial/ftdi_sio.c
Diff comments   View file @ 7fea0f7
... ... @@ -794,6 +794,8 @@
794 794 { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },
795 795 { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },
796 796 { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },
  797 + { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID),
  798 + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
797 799 { }, /* Optional parameter entry */
798 800 { } /* Terminating entry */
799 801 };
drivers/usb/serial/ftdi_sio_ids.h
Diff comments   View file @ 7fea0f7
... ... @@ -1100,4 +1100,10 @@
1100 1100 #define FTDI_SCIENCESCOPE_LOGBOOKML_PID 0xFF18
1101 1101 #define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID 0xFF1C
1102 1102 #define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID 0xFF1D
  1103 +
  1104 +/*
  1105 + * Milkymist One JTAG/Serial
  1106 + */
  1107 +#define QIHARDWARE_VID 0x20B7
  1108 +#define MILKYMISTONE_JTAGSERIAL_PID 0x0713