Skip to content

Commit b8a93e8

Browse files
committed
Merge tag 'usb-serial-6.12-rc1-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes: USB-serial device id for 6.12-rc1 Here's a new pl2303 device id. This one has been in linux-next with no reported issues. * tag 'usb-serial-6.12-rc1-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: USB: serial: pl2303: add device id for Macrosilicon MS3020
2 parents 7de106b + 7d47d22 commit b8a93e8

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

drivers/usb/serial/pl2303.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ static const struct usb_device_id id_table[] = {
118118
{ USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) },
119119
{ USB_DEVICE(AT_VENDOR_ID, AT_VTKIT3_PRODUCT_ID) },
120120
{ USB_DEVICE(IBM_VENDOR_ID, IBM_PRODUCT_ID) },
121+
{ USB_DEVICE(MACROSILICON_VENDOR_ID, MACROSILICON_MS3020_PRODUCT_ID) },
121122
{ } /* Terminating entry */
122123
};
123124

drivers/usb/serial/pl2303.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,3 +171,7 @@
171171
/* Allied Telesis VT-Kit3 */
172172
#define AT_VENDOR_ID 0x0caa
173173
#define AT_VTKIT3_PRODUCT_ID 0x3001
174+
175+
/* Macrosilicon MS3020 */
176+
#define MACROSILICON_VENDOR_ID 0x345f
177+
#define MACROSILICON_MS3020_PRODUCT_ID 0x3020

0 commit comments

Comments
 (0)