History

Merge tag 'usb-serial-5.18-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

Johan writes: USB-serial fixes for 5.18-rc7 Here are some new device ids. All have been in linux-next with no reported issues. * tag 'usb-serial-5.18-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: USB: serial: qcserial: add support for Sierra Wireless EM7590 USB: serial: option: add Fibocom MA510 modem USB: serial: option: add Fibocom L610 modem USB: serial: pl2303: add device id for HP LM930 Display

Greg Kroah-Hartman committed 4 years ago

Commit 757b9f62 parents 1645eee 870b1ee4 files · +8 −0Browse files

Unified · Split

4 files
  1. drivers/usb/serial/option.c +4 −0
  2. drivers/usb/serial/pl2303.c +1 −0
  3. drivers/usb/serial/pl2303.h +1 −0
  4. drivers/usb/serial/qcserial.c +2 −0
drivers/usb/serial/option.c+4−0
@@ -2123,10 +2123,14 @@ static const struct usb_device_id option_ids[] = { · 2122 unmodified lines
2123 .driver_info = RSVD(3) },2123 .driver_info = RSVD(3) },
2124 { USB_DEVICE(0x1508, 0x1001), /* Fibocom NL668 (IOT version) */2124 { USB_DEVICE(0x1508, 0x1001), /* Fibocom NL668 (IOT version) */
2125 .driver_info = RSVD(4) | RSVD(5) | RSVD(6) },2125 .driver_info = RSVD(4) | RSVD(5) | RSVD(6) },
2126 { USB_DEVICE(0x1782, 0x4d10) }, /* Fibocom L610 (AT mode) */
2127 { USB_DEVICE_INTERFACE_CLASS(0x1782, 0x4d11, 0xff) }, /* Fibocom L610 (ECM/RNDIS mode) */
2126 { USB_DEVICE(0x2cb7, 0x0104), /* Fibocom NL678 series */2128 { USB_DEVICE(0x2cb7, 0x0104), /* Fibocom NL678 series */
2127 .driver_info = RSVD(4) | RSVD(5) },2129 .driver_info = RSVD(4) | RSVD(5) },
2128 { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff), /* Fibocom NL678 series */2130 { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff), /* Fibocom NL678 series */
2129 .driver_info = RSVD(6) },2131 .driver_info = RSVD(6) },
2132 { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0106, 0xff) }, /* Fibocom MA510 (ECM mode w/ diag intf.) */
2133 { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x010a, 0xff) }, /* Fibocom MA510 (ECM mode) */
2130 { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) }, /* Fibocom FG150 Diag */2134 { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) }, /* Fibocom FG150 Diag */
2131 { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) }, /* Fibocom FG150 AT */2135 { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) }, /* Fibocom FG150 AT */
2132 { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */2136 { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */
drivers/usb/serial/pl2303.c+1−0
@@ -106,6 +106,7 @@ static const struct usb_device_id id_table[] = { · 105 unmodified lines
106 { USB_DEVICE(HP_VENDOR_ID, HP_LCM220_PRODUCT_ID) },106 { USB_DEVICE(HP_VENDOR_ID, HP_LCM220_PRODUCT_ID) },
107 { USB_DEVICE(HP_VENDOR_ID, HP_LCM960_PRODUCT_ID) },107 { USB_DEVICE(HP_VENDOR_ID, HP_LCM960_PRODUCT_ID) },
108 { USB_DEVICE(HP_VENDOR_ID, HP_LM920_PRODUCT_ID) },108 { USB_DEVICE(HP_VENDOR_ID, HP_LM920_PRODUCT_ID) },
109 { USB_DEVICE(HP_VENDOR_ID, HP_LM930_PRODUCT_ID) },
109 { USB_DEVICE(HP_VENDOR_ID, HP_LM940_PRODUCT_ID) },110 { USB_DEVICE(HP_VENDOR_ID, HP_LM940_PRODUCT_ID) },
110 { USB_DEVICE(HP_VENDOR_ID, HP_TD620_PRODUCT_ID) },111 { USB_DEVICE(HP_VENDOR_ID, HP_TD620_PRODUCT_ID) },
111 { USB_DEVICE(CRESSI_VENDOR_ID, CRESSI_EDY_PRODUCT_ID) },112 { USB_DEVICE(CRESSI_VENDOR_ID, CRESSI_EDY_PRODUCT_ID) },
drivers/usb/serial/pl2303.h+1−0
@@ -135,6 +135,7 @@ · 134 unmodified lines
135#define HP_TD620_PRODUCT_ID 0x0956135#define HP_TD620_PRODUCT_ID 0x0956
136#define HP_LD960_PRODUCT_ID 0x0b39136#define HP_LD960_PRODUCT_ID 0x0b39
137#define HP_LD381_PRODUCT_ID 0x0f7f137#define HP_LD381_PRODUCT_ID 0x0f7f
138#define HP_LM930_PRODUCT_ID 0x0f9b
138#define HP_LCM220_PRODUCT_ID 0x3139139#define HP_LCM220_PRODUCT_ID 0x3139
139#define HP_LCM960_PRODUCT_ID 0x3239140#define HP_LCM960_PRODUCT_ID 0x3239
140#define HP_LD220_PRODUCT_ID 0x3524141#define HP_LD220_PRODUCT_ID 0x3524
drivers/usb/serial/qcserial.c+2−0
@@ -166,6 +166,8 @@ static const struct usb_device_id id_table[] = { · 165 unmodified lines
166 {DEVICE_SWI(0x1199, 0x9090)}, /* Sierra Wireless EM7565 QDL */166 {DEVICE_SWI(0x1199, 0x9090)}, /* Sierra Wireless EM7565 QDL */
167 {DEVICE_SWI(0x1199, 0x9091)}, /* Sierra Wireless EM7565 */167 {DEVICE_SWI(0x1199, 0x9091)}, /* Sierra Wireless EM7565 */
168 {DEVICE_SWI(0x1199, 0x90d2)}, /* Sierra Wireless EM9191 QDL */168 {DEVICE_SWI(0x1199, 0x90d2)}, /* Sierra Wireless EM9191 QDL */
169 {DEVICE_SWI(0x1199, 0xc080)}, /* Sierra Wireless EM7590 QDL */
170 {DEVICE_SWI(0x1199, 0xc081)}, /* Sierra Wireless EM7590 */
169 {DEVICE_SWI(0x413c, 0x81a2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */171 {DEVICE_SWI(0x413c, 0x81a2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */
170 {DEVICE_SWI(0x413c, 0x81a3)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */172 {DEVICE_SWI(0x413c, 0x81a3)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */
171 {DEVICE_SWI(0x413c, 0x81a4)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */173 {DEVICE_SWI(0x413c, 0x81a4)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t