Commit 09cda8c8 authored by Cameron Williams's avatar Cameron Williams Committed by Zheng Zengkai
Browse files

USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320 

stable inclusion
from stable-v5.10.101
commit b7ed2f9619ccbf1bd70bdf02b68b5a9e0cdd15a1
bugzilla: https://gitee.com/openeuler/kernel/issues/I5669Z

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b7ed2f9619ccbf1bd70bdf02b68b5a9e0cdd15a1



--------------------------------

commit fbb9b194 upstream.

This patch adds support for the Brainboxes US-159, US-235 and US-320
USB-to-Serial devices.

Signed-off-by: default avatarCameron Williams <cang1@live.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarYu Liao <liaoyu15@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f3a1344d

drivers/usb/serial/ftdi_sio.c

+3 −0
Original line number Diff line number Diff line
@@ -969,6 +969,7 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_159_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) },
@@ -977,12 +978,14 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_235_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_320_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) },

	{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+3 −0
Original line number Diff line number Diff line
@@ -1506,6 +1506,9 @@ 
#define BRAINBOXES_VX_023_PID		0x1003 /* VX-023 ExpressCard 1 Port RS422/485 */

#define BRAINBOXES_VX_034_PID		0x1004 /* VX-034 ExpressCard 2 Port RS422/485 */

#define BRAINBOXES_US_101_PID		0x1011 /* US-101 1xRS232 */

#define BRAINBOXES_US_159_PID		0x1021 /* US-159 1xRS232 */

#define BRAINBOXES_US_235_PID		0x1017 /* US-235 1xRS232 */

#define BRAINBOXES_US_320_PID		0x1019 /* US-320 1xRS422/485 */

#define BRAINBOXES_US_324_PID		0x1013 /* US-324 1xRS422/485 1Mbaud */

#define BRAINBOXES_US_606_1_PID		0x2001 /* US-606 6 Port RS232 Serial Port 1 and 2 */

#define BRAINBOXES_US_606_2_PID		0x2002 /* US-606 6 Port RS232 Serial Port 3 and 4 */