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

Commit 6f92872c authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: VID/PID updates for ftdi_sio driver 



Some VID/PID updates for the ftdi_sio driver:

* The "Gude Analog- und Digitalsysteme GmbH" entries were missing from
  the "combined" table.
* Replaced FTDI_8U232AM_ALT_ALT_PID with 3 PIDs for devices from
  4n-galaxy.de.
* Removed redundant FTDI_RM_VID and renamed FTDI_RMCANVIEW_PID to
  FTDI_RM_CANVIEW_PID.
* Added VID/PID for serial converter in Mobility Electronics EasiDock
  USB 200 (mentioned by Gregory Schmitt).
* Added PID for Active Robots USB comms board (mentioned by John Koch).

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>

diff -ur a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
parent b9ab0746

drivers/usb/serial/ftdi_sio.c

+32 −6
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ static int debug; 


static struct usb_device_id id_table_sio [] = {

	{ USB_DEVICE(FTDI_VID, FTDI_SIO_PID) },

	{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },

	{ }						/* Terminating entry */

};
@@ -296,7 +297,6 @@ static struct usb_device_id id_table_8U232AM [] = { 
	{ USB_DEVICE_VER(FTDI_VID, FTDI_IRTRANS_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_8U232AM_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_8U232AM_ALT_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_8U232AM_ALT_ALT_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_RELAIS_PID, 0, 0x3ff) },

	{ USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },

	{ USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) },
@@ -369,11 +369,14 @@ static struct usb_device_id id_table_8U232AM [] = { 
	{ USB_DEVICE_VER(INTREPID_VID, INTREPID_NEOVI_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FALCOM_VID, FALCOM_TWIST_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_SUUNTO_SPORTS_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_RM_VID, FTDI_RMCANVIEW_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_RM_CANVIEW_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(BANDB_VID, BANDB_USOTL4_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(BANDB_VID, BANDB_USTL4_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(BANDB_VID, BANDB_USO9ML2_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_VID, EVER_ECO_PRO_CDS, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_4N_GALAXY_DE_0_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_4N_GALAXY_DE_1_PID, 0, 0x3ff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID, 0, 0x3ff) },

	{ }						/* Terminating entry */

};
@@ -382,7 +385,6 @@ static struct usb_device_id id_table_FT232BM [] = { 
	{ USB_DEVICE_VER(FTDI_VID, FTDI_IRTRANS_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_8U232AM_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_8U232AM_ALT_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_8U232AM_ALT_ALT_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_RELAIS_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_NF_RIC_VID, FTDI_NF_RIC_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_XF_632_PID, 0x400, 0xffff) },
@@ -485,11 +487,15 @@ static struct usb_device_id id_table_FT232BM [] = { 
	{ USB_DEVICE_VER(INTREPID_VID, INTREPID_NEOVI_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FALCOM_VID, FALCOM_TWIST_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_SUUNTO_SPORTS_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_RM_VID, FTDI_RMCANVIEW_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_RM_CANVIEW_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(BANDB_VID, BANDB_USOTL4_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(BANDB_VID, BANDB_USTL4_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(BANDB_VID, BANDB_USO9ML2_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, EVER_ECO_PRO_CDS, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_4N_GALAXY_DE_0_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_4N_GALAXY_DE_1_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID, 0x400, 0xffff) },

	{ }						/* Terminating entry */

};
@@ -517,7 +523,6 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_SIO_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_ALT_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_8U2232C_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_RELAIS_PID) },

	{ USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },
@@ -596,6 +601,22 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(FTDI_VID, PROTEGO_R2X0) },

	{ USB_DEVICE(FTDI_VID, PROTEGO_SPECIAL_3) },

	{ USB_DEVICE(FTDI_VID, PROTEGO_SPECIAL_4) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E808_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E809_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E80A_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E80B_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E80C_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E80D_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E80E_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E80F_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E888_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E889_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88A_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88B_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88C_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88D_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88E_PID, 0x400, 0xffff) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_GUDEADS_E88F_PID, 0x400, 0xffff) },

	{ USB_DEVICE(FTDI_VID, FTDI_ELV_UO100_PID) },

 	{ USB_DEVICE_VER(FTDI_VID, LINX_SDMUSBQSS_PID, 0x400, 0xffff) },

 	{ USB_DEVICE_VER(FTDI_VID, LINX_MASTERDEVEL2_PID, 0x400, 0xffff) },
@@ -609,11 +630,16 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(INTREPID_VID, INTREPID_NEOVI_PID) },

	{ USB_DEVICE(FALCOM_VID, FALCOM_TWIST_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_SUUNTO_SPORTS_PID) },

	{ USB_DEVICE(FTDI_RM_VID, FTDI_RMCANVIEW_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) },

	{ USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) },

	{ USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) },

	{ USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) },

	{ USB_DEVICE(FTDI_VID, EVER_ECO_PRO_CDS) },

	{ USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_0_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_1_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID) },

	{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },

	{ USB_DEVICE_VER(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID, 0x400, 0xffff) },

	{ }						/* Terminating entry */

};

drivers/usb/serial/ftdi_sio.h

+25 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#define FTDI_SIO_PID	0x8372	/* Product Id SIO application of 8U100AX  */

#define FTDI_8U232AM_PID 0x6001 /* Similar device to SIO above */

#define FTDI_8U232AM_ALT_PID 0x6006 /* FTDI's alternate PID for above */

#define FTDI_8U232AM_ALT_ALT_PID 0xf3c0 /* FTDI's second alternate PID for above */

#define FTDI_8U2232C_PID 0x6010 /* Dual channel device */

#define FTDI_RELAIS_PID	0xFA10  /* Relais device from Rudolf Gugler */

#define FTDI_NF_RIC_VID	0x0DCD	/* Vendor Id */
@@ -157,7 +156,8 @@ 
 */

#define OCT_VID			0x0B39	/* OCT vendor ID */

/* Note: OCT US101 is also rebadged as Dick Smith Electronics (NZ) XH6381 */

/* Also rebadged as SIIG Inc. model US2308 */

/* Also rebadged as Dick Smith Electronics (Aus) XH6451 */

/* Also rebadged as SIIG Inc. model US2308 hardware version 1 */

#define OCT_US101_PID		0x0421	/* OCT US101 USB to RS-232 */



/* an infrared receiver for user access control with IR tags */
@@ -236,10 +236,10 @@ 


/*

 * RM Michaelides CANview USB (http://www.rmcan.com)

 * CAN filedbus interface adapter, addad by port GmbH www.port.de)

 * CAN fieldbus interface adapter, added by port GmbH www.port.de)

 * Ian Abbott changed the macro names for consistency.

 */

#define FTDI_RM_VID		0x0403	/* Vendor  Id */

#define FTDI_RMCANVIEW_PID	0xfd60	/* Product Id */

#define FTDI_RM_CANVIEW_PID	0xfd60	/* Product Id */



/*

 * EVER Eco Pro UPS (http://www.ever.com.pl/)
@@ -247,6 +247,26 @@ 


#define	EVER_ECO_PRO_CDS	0xe520	/* RS-232 converter */



/*

 * 4N-GALAXY.DE PIDs for CAN-USB, USB-RS232, USB-RS422, USB-RS485,

 * USB-TTY activ, USB-TTY passiv.  Some PIDs are used by several devices

 * and I'm not entirely sure which are used by which.

 */

#define FTDI_4N_GALAXY_DE_0_PID	0x8372

#define FTDI_4N_GALAXY_DE_1_PID	0xF3C0

#define FTDI_4N_GALAXY_DE_2_PID	0xF3C1



/*

 * Mobility Electronics products.

 */

#define MOBILITY_VID			0x1342

#define MOBILITY_USB_SERIAL_PID		0x0202	/* EasiDock USB 200 serial */



/*

 * Active Robots product ids.

 */

#define FTDI_ACTIVE_ROBOTS_PID	0xE548	/* USB comms board */



/* Commands */

#define FTDI_SIO_RESET 		0 /* Reset the port */

#define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */