Skip to content

Commit c1dd10c

Browse files
gregkhgregkh
committed
Merge tag 'usb-serial-5.17-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for 5.17-rc4 Here are some new device ids for 5.17-rc4. All have been in linux-next with no reported issues. * tag 'usb-serial-5.17-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: USB: serial: cp210x: add CPI Bulk Coin Recycler id USB: serial: cp210x: add NCR Retail IO box id USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320 USB: serial: option: add ZTE MF286D modem USB: serial: ch341: add support for GW Instek USB2.0-Serial devices
2 parents 269cbcf + 6ca0c62 commit c1dd10c

File tree

5 files changed

+11
-0
lines changed

5 files changed

+11
-0
lines changed

‎drivers/usb/serial/ch341.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ static const struct usb_device_id id_table[] = {
8585
{ USB_DEVICE(0x1a86, 0x5523) },
8686
{ USB_DEVICE(0x1a86, 0x7522) },
8787
{ USB_DEVICE(0x1a86, 0x7523) },
88+
{ USB_DEVICE(0x2184, 0x0057) },
8889
{ USB_DEVICE(0x4348, 0x5523) },
8990
{ USB_DEVICE(0x9986, 0x7523) },
9091
{ },

‎drivers/usb/serial/cp210x.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ static void cp210x_enable_event_mode(struct usb_serial_port *port);
5151
static void cp210x_disable_event_mode(struct usb_serial_port *port);
5252

5353
static const struct usb_device_id id_table[] = {
54+
{ USB_DEVICE(0x0404, 0x034C) }, /* NCR Retail IO Box */
5455
{ USB_DEVICE(0x045B, 0x0053) }, /* Renesas RX610 RX-Stick */
5556
{ USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */
5657
{ USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */
@@ -68,6 +69,7 @@ static const struct usb_device_id id_table[] = {
6869
{ USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */
6970
{ USB_DEVICE(0x0FCF, 0x1006) }, /* Dynastream ANT development board */
7071
{ USB_DEVICE(0x0FDE, 0xCA05) }, /* OWL Wireless Electricity Monitor CM-160 */
72+
{ USB_DEVICE(0x106F, 0x0003) }, /* CPI / Money Controls Bulk Coin Recycler */
7173
{ USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */
7274
{ USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */
7375
{ USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */

‎drivers/usb/serial/ftdi_sio.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,7 @@ static const struct usb_device_id id_table_combined[] = {
969969
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_023_PID) },
970970
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_VX_034_PID) },
971971
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_101_PID) },
972+
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_159_PID) },
972973
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_1_PID) },
973974
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_2_PID) },
974975
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_3_PID) },
@@ -977,12 +978,14 @@ static const struct usb_device_id id_table_combined[] = {
977978
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_6_PID) },
978979
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_7_PID) },
979980
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_160_8_PID) },
981+
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_235_PID) },
980982
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_257_PID) },
981983
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_1_PID) },
982984
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_2_PID) },
983985
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_3_PID) },
984986
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_279_4_PID) },
985987
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_313_PID) },
988+
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_320_PID) },
986989
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_324_PID) },
987990
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_1_PID) },
988991
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_346_2_PID) },

‎drivers/usb/serial/ftdi_sio_ids.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,6 +1506,9 @@
15061506
#define BRAINBOXES_VX_023_PID 0x1003 /* VX-023 ExpressCard 1 Port RS422/485 */
15071507
#define BRAINBOXES_VX_034_PID 0x1004 /* VX-034 ExpressCard 2 Port RS422/485 */
15081508
#define BRAINBOXES_US_101_PID 0x1011 /* US-101 1xRS232 */
1509+
#define BRAINBOXES_US_159_PID 0x1021 /* US-159 1xRS232 */
1510+
#define BRAINBOXES_US_235_PID 0x1017 /* US-235 1xRS232 */
1511+
#define BRAINBOXES_US_320_PID 0x1019 /* US-320 1xRS422/485 */
15091512
#define BRAINBOXES_US_324_PID 0x1013 /* US-324 1xRS422/485 1Mbaud */
15101513
#define BRAINBOXES_US_606_1_PID 0x2001 /* US-606 6 Port RS232 Serial Port 1 and 2 */
15111514
#define BRAINBOXES_US_606_2_PID 0x2002 /* US-606 6 Port RS232 Serial Port 3 and 4 */

‎drivers/usb/serial/option.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,6 +1649,8 @@ static const struct usb_device_id option_ids[] = {
16491649
.driver_info = RSVD(2) },
16501650
{ USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x1476, 0xff) }, /* GosunCn ZTE WeLink ME3630 (ECM/NCM mode) */
16511651
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1481, 0xff, 0x00, 0x00) }, /* ZTE MF871A */
1652+
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1485, 0xff, 0xff, 0xff), /* ZTE MF286D */
1653+
.driver_info = RSVD(5) },
16521654
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1533, 0xff, 0xff, 0xff) },
16531655
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1534, 0xff, 0xff, 0xff) },
16541656
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1535, 0xff, 0xff, 0xff) },

0 commit comments

Comments
 (0)