Skip to content

Commit 367e9ed

Browse files
Niek Nooijenssmb49
authored andcommitted
USB: serial: ftdi_sio: add Omron CS1W-CIF31 device id
BugLink: https://bugs.launchpad.net/bugs/1992211 commit 001047e upstream. works perfectly with: modprobe ftdi_sio echo "0590 00b2" | tee /sys/module/ftdi_sio/drivers/usb-serial\:ftdi_sio/new_id > /dev/null but doing this every reboot is a pain in the ass. Signed-off-by: Niek Nooijens <niek.nooijens@omron.com> Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 3e4f3e4 commit 367e9ed

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

drivers/usb/serial/ftdi_sio.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,6 +1045,8 @@ static const struct usb_device_id id_table_combined[] = {
10451045
/* IDS GmbH devices */
10461046
{ USB_DEVICE(IDS_VID, IDS_SI31A_PID) },
10471047
{ USB_DEVICE(IDS_VID, IDS_CM31A_PID) },
1048+
/* Omron devices */
1049+
{ USB_DEVICE(OMRON_VID, OMRON_CS1W_CIF31_PID) },
10481050
/* U-Blox devices */
10491051
{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) },
10501052
{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) },

drivers/usb/serial/ftdi_sio_ids.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,12 @@
661661
#define INFINEON_TRIBOARD_TC1798_PID 0x0028 /* DAS JTAG TriBoard TC1798 V1.0 */
662662
#define INFINEON_TRIBOARD_TC2X7_PID 0x0043 /* DAS JTAG TriBoard TC2X7 V1.0 */
663663

664+
/*
665+
* Omron corporation (https://www.omron.com)
666+
*/
667+
#define OMRON_VID 0x0590
668+
#define OMRON_CS1W_CIF31_PID 0x00b2
669+
664670
/*
665671
* Acton Research Corp.
666672
*/

0 commit comments

Comments
 (0)