Skip to content

Commit 58f504e

Browse files
torvaldstorvalds
committed
Merge tag 'tty-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty / serial driver updates from Greg KH: "Here is the tty/serial driver set of changes for 6.14-rc1. Nothing major in here, it was delayed a bit due to a regression found in linux-next which has now been reverted and verified that it is fixed. Other than the reverts, highlights include: - 8250 work to get the nbcon mode working (partially reverted) - altera_jtaguart minor fixes - fsl_lpuart minor updates - sh-sci driver minor updatesa - other tiny driver updates and cleanups All of these have been in linux-next for a while, and now with no reports of problems (thanks to the reverts)" * tag 'tty-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (44 commits) Revert "serial: 8250: Switch to nbcon console" Revert "serial: 8250: Revert "drop lockdep annotation from serial8250_clear_IER()"" serial: sh-sci: Increment the runtime usage counter for the earlycon device serial: sh-sci: Clean sci_ports[0] after at earlycon exit serial: sh-sci: Do not probe the serial port if its slot in sci_ports[] is in use serial: sh-sci: Move runtime PM enable to sci_probe_single() serial: sh-sci: Drop __initdata macro for port_cfg serial: kgdb_nmi: Remove unused knock code tty: Permit some TIOCL_SETSEL modes without CAP_SYS_ADMIN tty: xilinx_uartps: split sysrq handling serial: 8250: Revert "drop lockdep annotation from serial8250_clear_IER()" serial: 8250: Switch to nbcon console serial: 8250: Provide flag for IER toggling for RS485 serial: 8250: Use high-level writing function for FIFO serial: 8250: Use frame time to determine timeout serial: 8250: Adjust the timeout for FIFO mode tty: atmel_serial: Use of_property_present() for non-boolean properties serial: sc16is7xx: Add polling mode if no IRQ pin is available dt-bindings: serial: sc16is7xx: Add description for polling mode tty: serial: atmel: make it selectable for ARCH_LAN969X ...
2 parents e2ee2e9 + f79b163 commit 58f504e

30 files changed

+592
-433
lines changed

‎Documentation/devicetree/bindings/serial/nxp,sc16is7xx.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ properties:
2323
maxItems: 1
2424

2525
interrupts:
26+
description:
27+
When missing, device driver uses polling instead.
2628
maxItems: 1
2729

2830
clocks:
@@ -76,7 +78,6 @@ properties:
7678
required:
7779
- compatible
7880
- reg
79-
- interrupts
8081

8182
allOf:
8283
- $ref: /schemas/spi/spi-peripheral-props.yaml#

‎Documentation/devicetree/bindings/serial/renesas,scif.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ properties:
8383

8484
- const: renesas,scif-r9a09g057 # RZ/V2H(P)
8585

86+
- items:
87+
- enum:
88+
- renesas,scif-r9a09g047 # RZ/G3E
89+
- const: renesas,scif-r9a09g057 # RZ/V2H fallback
90+
8691
reg:
8792
maxItems: 1
8893

‎drivers/parport/parport_serial.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,14 @@ static struct pci_device_id parport_serial_pci_tbl[] = {
266266
{ 0x1409, 0x7168, 0x1409, 0xd079, 0, 0, timedia_9079c },
267267

268268
/* WCH CARDS */
269-
{ 0x4348, 0x5053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, wch_ch353_1s1p},
270-
{ 0x4348, 0x7053, 0x4348, 0x3253, 0, 0, wch_ch353_2s1p},
271-
{ 0x1c00, 0x3050, 0x1c00, 0x3050, 0, 0, wch_ch382_0s1p},
272-
{ 0x1c00, 0x3250, 0x1c00, 0x3250, 0, 0, wch_ch382_2s1p},
269+
{ PCI_VENDOR_ID_WCHCN, PCI_DEVICE_ID_WCHCN_CH353_1S1P,
270+
PCI_ANY_ID, PCI_ANY_ID, 0, 0, wch_ch353_1s1p },
271+
{ PCI_VENDOR_ID_WCHCN, PCI_DEVICE_ID_WCHCN_CH353_2S1P,
272+
0x4348, 0x3253, 0, 0, wch_ch353_2s1p },
273+
{ PCI_VENDOR_ID_WCHIC, PCI_DEVICE_ID_WCHIC_CH382_0S1P,
274+
0x1c00, 0x3050, 0, 0, wch_ch382_0s1p },
275+
{ PCI_VENDOR_ID_WCHIC, PCI_DEVICE_ID_WCHIC_CH382_2S1P,
276+
0x1c00, 0x3250, 0, 0, wch_ch382_2s1p },
273277

274278
/* BrainBoxes PX272/PX306 MIO card */
275279
{ PCI_VENDOR_ID_INTASHIELD, 0x4100,

‎drivers/tty/mips_ejtag_fdc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ static char kgdbfdc_rbuf[4];
11541154

11551155
/* write buffer to allow compaction */
11561156
static unsigned int kgdbfdc_wbuflen;
1157-
static char kgdbfdc_wbuf[4];
1157+
static u8 kgdbfdc_wbuf[4];
11581158

11591159
static void __iomem *kgdbfdc_setup(void)
11601160
{
@@ -1215,7 +1215,7 @@ static int kgdbfdc_read_char(void)
12151215
/* push an FDC word from write buffer to TX FIFO */
12161216
static void kgdbfdc_push_one(void)
12171217
{
1218-
const char *bufs[1] = { kgdbfdc_wbuf };
1218+
const u8 *bufs[1] = { kgdbfdc_wbuf };
12191219
struct fdc_word word;
12201220
void __iomem *regs;
12211221
unsigned int i;

‎drivers/tty/n_gsm.c‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,7 +2224,7 @@ static int gsm_dlci_negotiate(struct gsm_dlci *dlci)
22242224
*
22252225
* Some control dlci can stay in ADM mode with other dlci working just
22262226
* fine. In that case we can just keep the control dlci open after the
2227-
* DLCI_OPENING retries time out.
2227+
* DLCI_OPENING receives DM.
22282228
*/
22292229

22302230
static void gsm_dlci_t1(struct timer_list *t)
@@ -2243,16 +2243,19 @@ static void gsm_dlci_t1(struct timer_list *t)
22432243
}
22442244
break;
22452245
case DLCI_OPENING:
2246-
if (dlci->retries) {
2247-
dlci->retries--;
2248-
gsm_command(dlci->gsm, dlci->addr, SABM|PF);
2249-
mod_timer(&dlci->t1, jiffies + gsm->t1 * HZ / 100);
2250-
} else if (!dlci->addr && gsm->control == (DM | PF)) {
2246+
if (!dlci->addr && gsm->control == (DM | PF)) {
22512247
if (debug & DBG_ERRORS)
2252-
pr_info("DLCI %d opening in ADM mode.\n",
2253-
dlci->addr);
2248+
pr_info("DLCI 0 opening in ADM mode.\n");
22542249
dlci->mode = DLCI_MODE_ADM;
22552250
gsm_dlci_open(dlci);
2251+
} else if (dlci->retries) {
2252+
if (!dlci->addr || !gsm->dlci[0] ||
2253+
gsm->dlci[0]->state != DLCI_OPENING) {
2254+
dlci->retries--;
2255+
gsm_command(dlci->gsm, dlci->addr, SABM|PF);
2256+
}
2257+
2258+
mod_timer(&dlci->t1, jiffies + gsm->t1 * HZ / 100);
22562259
} else {
22572260
gsm->open_error++;
22582261
gsm_dlci_begin_close(dlci); /* prevent half open link */
@@ -2308,7 +2311,9 @@ static void gsm_dlci_begin_open(struct gsm_dlci *dlci)
23082311
dlci->retries = gsm->n2;
23092312
if (!need_pn) {
23102313
dlci->state = DLCI_OPENING;
2311-
gsm_command(gsm, dlci->addr, SABM|PF);
2314+
if (!dlci->addr || !gsm->dlci[0] ||
2315+
gsm->dlci[0]->state != DLCI_OPENING)
2316+
gsm_command(gsm, dlci->addr, SABM|PF);
23122317
} else {
23132318
/* Configure DLCI before setup */
23142319
dlci->state = DLCI_CONFIGURE;
@@ -4251,7 +4256,7 @@ static const struct tty_port_operations gsm_port_ops = {
42514256
static int gsmtty_install(struct tty_driver *driver, struct tty_struct *tty)
42524257
{
42534258
struct gsm_mux *gsm;
4254-
struct gsm_dlci *dlci;
4259+
struct gsm_dlci *dlci, *dlci0;
42554260
unsigned int line = tty->index;
42564261
unsigned int mux = mux_line_to_num(line);
42574262
bool alloc = false;
@@ -4274,10 +4279,20 @@ static int gsmtty_install(struct tty_driver *driver, struct tty_struct *tty)
42744279
perspective as we don't have to worry about this
42754280
if DLCI0 is lost */
42764281
mutex_lock(&gsm->mutex);
4277-
if (gsm->dlci[0] && gsm->dlci[0]->state != DLCI_OPEN) {
4282+
4283+
dlci0 = gsm->dlci[0];
4284+
if (dlci0 && dlci0->state != DLCI_OPEN) {
42784285
mutex_unlock(&gsm->mutex);
4279-
return -EL2NSYNC;
4286+
4287+
if (dlci0->state == DLCI_OPENING)
4288+
wait_event(gsm->event, dlci0->state != DLCI_OPENING);
4289+
4290+
if (dlci0->state != DLCI_OPEN)
4291+
return -EL2NSYNC;
4292+
4293+
mutex_lock(&gsm->mutex);
42804294
}
4295+
42814296
dlci = gsm->dlci[line];
42824297
if (dlci == NULL) {
42834298
alloc = true;

‎drivers/tty/serial/8250/8250.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ void serial8250_rpm_put_tx(struct uart_8250_port *p);
231231

232232
int serial8250_em485_config(struct uart_port *port, struct ktermios *termios,
233233
struct serial_rs485 *rs485);
234-
void serial8250_em485_start_tx(struct uart_8250_port *p);
235-
void serial8250_em485_stop_tx(struct uart_8250_port *p);
234+
void serial8250_em485_start_tx(struct uart_8250_port *p, bool toggle_ier);
235+
void serial8250_em485_stop_tx(struct uart_8250_port *p, bool toggle_ier);
236236
void serial8250_em485_destroy(struct uart_8250_port *p);
237237
extern struct serial_rs485 serial8250_em485_supported;
238238

‎drivers/tty/serial/8250/8250_bcm2835aux.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ struct bcm2835aux_data {
4646
u32 cntl;
4747
};
4848

49-
static void bcm2835aux_rs485_start_tx(struct uart_8250_port *up)
49+
static void bcm2835aux_rs485_start_tx(struct uart_8250_port *up, bool toggle_ier)
5050
{
5151
if (!(up->port.rs485.flags & SER_RS485_RX_DURING_TX)) {
5252
struct bcm2835aux_data *data = dev_get_drvdata(up->port.dev);
@@ -65,7 +65,7 @@ static void bcm2835aux_rs485_start_tx(struct uart_8250_port *up)
6565
serial8250_out_MCR(up, UART_MCR_RTS);
6666
}
6767

68-
static void bcm2835aux_rs485_stop_tx(struct uart_8250_port *up)
68+
static void bcm2835aux_rs485_stop_tx(struct uart_8250_port *up, bool toggle_ier)
6969
{
7070
if (up->port.rs485.flags & SER_RS485_RTS_AFTER_SEND)
7171
serial8250_out_MCR(up, 0);

‎drivers/tty/serial/8250/8250_core.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,6 @@ static void serial_8250_overrun_backoff_work(struct work_struct *work)
675675

676676
uart_port_lock_irqsave(port, &flags);
677677
up->ier |= UART_IER_RLSI | UART_IER_RDI;
678-
up->port.read_status_mask |= UART_LSR_DR;
679678
serial_out(up, UART_IER, up->ier);
680679
uart_port_unlock_irqrestore(port, flags);
681680
}

‎drivers/tty/serial/8250/8250_omap.c‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ static void omap8250_restore_regs(struct uart_8250_port *up)
365365

366366
if (up->port.rs485.flags & SER_RS485_ENABLED &&
367367
up->port.rs485_config == serial8250_em485_config)
368-
serial8250_em485_stop_tx(up);
368+
serial8250_em485_stop_tx(up, true);
369369
}
370370

371371
/*
@@ -412,7 +412,13 @@ static void omap_8250_set_termios(struct uart_port *port,
412412
*/
413413
uart_update_timeout(port, termios->c_cflag, baud);
414414

415-
up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR;
415+
/*
416+
* Specify which conditions may be considered for error
417+
* handling and the ignoring of characters. The actual
418+
* ignoring of characters only occurs if the bit is set
419+
* in @ignore_status_mask as well.
420+
*/
421+
up->port.read_status_mask = UART_LSR_OE | UART_LSR_DR;
416422
if (termios->c_iflag & INPCK)
417423
up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE;
418424
if (termios->c_iflag & (IGNBRK | PARMRK))
@@ -838,7 +844,6 @@ static void omap_8250_unthrottle(struct uart_port *port)
838844
if (up->dma)
839845
up->dma->rx_dma(up);
840846
up->ier |= UART_IER_RLSI | UART_IER_RDI;
841-
port->read_status_mask |= UART_LSR_DR;
842847
serial_out(up, UART_IER, up->ier);
843848
uart_port_unlock_irqrestore(port, flags);
844849

‎drivers/tty/serial/8250/8250_pci.c‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,17 @@
6464
#define PCIE_DEVICE_ID_NEO_2_OX_IBM 0x00F6
6565
#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA 0xc001
6666
#define PCI_DEVICE_ID_INTEL_PATSBURG_KT 0x1d3d
67-
#define PCI_VENDOR_ID_WCH 0x4348
68-
#define PCI_DEVICE_ID_WCH_CH352_2S 0x3253
69-
#define PCI_DEVICE_ID_WCH_CH353_4S 0x3453
70-
#define PCI_DEVICE_ID_WCH_CH353_2S1PF 0x5046
71-
#define PCI_DEVICE_ID_WCH_CH353_1S1P 0x5053
72-
#define PCI_DEVICE_ID_WCH_CH353_2S1P 0x7053
73-
#define PCI_DEVICE_ID_WCH_CH355_4S 0x7173
67+
68+
#define PCI_DEVICE_ID_WCHCN_CH352_2S 0x3253
69+
#define PCI_DEVICE_ID_WCHCN_CH355_4S 0x7173
70+
7471
#define PCI_VENDOR_ID_AGESTAR 0x5372
7572
#define PCI_DEVICE_ID_AGESTAR_9375 0x6872
7673
#define PCI_DEVICE_ID_BROADCOM_TRUMANAGE 0x160a
7774
#define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800 0x818e
7875

79-
#define PCIE_VENDOR_ID_WCH 0x1c00
80-
#define PCIE_DEVICE_ID_WCH_CH382_2S1P 0x3250
81-
#define PCIE_DEVICE_ID_WCH_CH384_4S 0x3470
82-
#define PCIE_DEVICE_ID_WCH_CH384_8S 0x3853
83-
#define PCIE_DEVICE_ID_WCH_CH382_2S 0x3253
76+
#define PCI_DEVICE_ID_WCHIC_CH384_4S 0x3470
77+
#define PCI_DEVICE_ID_WCHIC_CH384_8S 0x3853
8478

8579
#define PCI_DEVICE_ID_MOXA_CP102E 0x1024
8680
#define PCI_DEVICE_ID_MOXA_CP102EL 0x1025
@@ -2817,80 +2811,80 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
28172811
},
28182812
/* WCH CH353 1S1P card (16550 clone) */
28192813
{
2820-
.vendor = PCI_VENDOR_ID_WCH,
2821-
.device = PCI_DEVICE_ID_WCH_CH353_1S1P,
2814+
.vendor = PCI_VENDOR_ID_WCHCN,
2815+
.device = PCI_DEVICE_ID_WCHCN_CH353_1S1P,
28222816
.subvendor = PCI_ANY_ID,
28232817
.subdevice = PCI_ANY_ID,
28242818
.setup = pci_wch_ch353_setup,
28252819
},
28262820
/* WCH CH353 2S1P card (16550 clone) */
28272821
{
2828-
.vendor = PCI_VENDOR_ID_WCH,
2829-
.device = PCI_DEVICE_ID_WCH_CH353_2S1P,
2822+
.vendor = PCI_VENDOR_ID_WCHCN,
2823+
.device = PCI_DEVICE_ID_WCHCN_CH353_2S1P,
28302824
.subvendor = PCI_ANY_ID,
28312825
.subdevice = PCI_ANY_ID,
28322826
.setup = pci_wch_ch353_setup,
28332827
},
28342828
/* WCH CH353 4S card (16550 clone) */
28352829
{
2836-
.vendor = PCI_VENDOR_ID_WCH,
2837-
.device = PCI_DEVICE_ID_WCH_CH353_4S,
2830+
.vendor = PCI_VENDOR_ID_WCHCN,
2831+
.device = PCI_DEVICE_ID_WCHCN_CH353_4S,
28382832
.subvendor = PCI_ANY_ID,
28392833
.subdevice = PCI_ANY_ID,
28402834
.setup = pci_wch_ch353_setup,
28412835
},
28422836
/* WCH CH353 2S1PF card (16550 clone) */
28432837
{
2844-
.vendor = PCI_VENDOR_ID_WCH,
2845-
.device = PCI_DEVICE_ID_WCH_CH353_2S1PF,
2838+
.vendor = PCI_VENDOR_ID_WCHCN,
2839+
.device = PCI_DEVICE_ID_WCHCN_CH353_2S1PF,
28462840
.subvendor = PCI_ANY_ID,
28472841
.subdevice = PCI_ANY_ID,
28482842
.setup = pci_wch_ch353_setup,
28492843
},
28502844
/* WCH CH352 2S card (16550 clone) */
28512845
{
2852-
.vendor = PCI_VENDOR_ID_WCH,
2853-
.device = PCI_DEVICE_ID_WCH_CH352_2S,
2846+
.vendor = PCI_VENDOR_ID_WCHCN,
2847+
.device = PCI_DEVICE_ID_WCHCN_CH352_2S,
28542848
.subvendor = PCI_ANY_ID,
28552849
.subdevice = PCI_ANY_ID,
28562850
.setup = pci_wch_ch353_setup,
28572851
},
28582852
/* WCH CH355 4S card (16550 clone) */
28592853
{
2860-
.vendor = PCI_VENDOR_ID_WCH,
2861-
.device = PCI_DEVICE_ID_WCH_CH355_4S,
2854+
.vendor = PCI_VENDOR_ID_WCHCN,
2855+
.device = PCI_DEVICE_ID_WCHCN_CH355_4S,
28622856
.subvendor = PCI_ANY_ID,
28632857
.subdevice = PCI_ANY_ID,
28642858
.setup = pci_wch_ch355_setup,
28652859
},
28662860
/* WCH CH382 2S card (16850 clone) */
28672861
{
2868-
.vendor = PCIE_VENDOR_ID_WCH,
2869-
.device = PCIE_DEVICE_ID_WCH_CH382_2S,
2862+
.vendor = PCI_VENDOR_ID_WCHIC,
2863+
.device = PCI_DEVICE_ID_WCHIC_CH382_2S,
28702864
.subvendor = PCI_ANY_ID,
28712865
.subdevice = PCI_ANY_ID,
28722866
.setup = pci_wch_ch38x_setup,
28732867
},
28742868
/* WCH CH382 2S1P card (16850 clone) */
28752869
{
2876-
.vendor = PCIE_VENDOR_ID_WCH,
2877-
.device = PCIE_DEVICE_ID_WCH_CH382_2S1P,
2870+
.vendor = PCI_VENDOR_ID_WCHIC,
2871+
.device = PCI_DEVICE_ID_WCHIC_CH382_2S1P,
28782872
.subvendor = PCI_ANY_ID,
28792873
.subdevice = PCI_ANY_ID,
28802874
.setup = pci_wch_ch38x_setup,
28812875
},
28822876
/* WCH CH384 4S card (16850 clone) */
28832877
{
2884-
.vendor = PCIE_VENDOR_ID_WCH,
2885-
.device = PCIE_DEVICE_ID_WCH_CH384_4S,
2878+
.vendor = PCI_VENDOR_ID_WCHIC,
2879+
.device = PCI_DEVICE_ID_WCHIC_CH384_4S,
28862880
.subvendor = PCI_ANY_ID,
28872881
.subdevice = PCI_ANY_ID,
28882882
.setup = pci_wch_ch38x_setup,
28892883
},
28902884
/* WCH CH384 8S card (16850 clone) */
28912885
{
2892-
.vendor = PCIE_VENDOR_ID_WCH,
2893-
.device = PCIE_DEVICE_ID_WCH_CH384_8S,
2886+
.vendor = PCI_VENDOR_ID_WCHIC,
2887+
.device = PCI_DEVICE_ID_WCHIC_CH384_8S,
28942888
.subvendor = PCI_ANY_ID,
28952889
.subdevice = PCI_ANY_ID,
28962890
.init = pci_wch_ch38x_init,
@@ -3967,11 +3961,11 @@ static const struct pci_device_id blacklist[] = {
39673961

39683962
/* multi-io cards handled by parport_serial */
39693963
/* WCH CH353 2S1P */
3970-
{ PCI_DEVICE(0x4348, 0x7053), 0, 0, REPORT_CONFIG(PARPORT_SERIAL), },
3964+
{ PCI_VDEVICE(WCHCN, 0x7053), REPORT_CONFIG(PARPORT_SERIAL), },
39713965
/* WCH CH353 1S1P */
3972-
{ PCI_DEVICE(0x4348, 0x5053), 0, 0, REPORT_CONFIG(PARPORT_SERIAL), },
3966+
{ PCI_VDEVICE(WCHCN, 0x5053), REPORT_CONFIG(PARPORT_SERIAL), },
39733967
/* WCH CH382 2S1P */
3974-
{ PCI_DEVICE(0x1c00, 0x3250), 0, 0, REPORT_CONFIG(PARPORT_SERIAL), },
3968+
{ PCI_VDEVICE(WCHIC, 0x3250), REPORT_CONFIG(PARPORT_SERIAL), },
39753969

39763970
/* Intel platforms with MID UART */
39773971
{ PCI_VDEVICE(INTEL, 0x081b), REPORT_8250_CONFIG(MID), },
@@ -6044,27 +6038,27 @@ static const struct pci_device_id serial_pci_tbl[] = {
60446038
* WCH CH353 series devices: The 2S1P is handled by parport_serial
60456039
* so not listed here.
60466040
*/
6047-
{ PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH353_4S,
6041+
{ PCI_VENDOR_ID_WCHCN, PCI_DEVICE_ID_WCHCN_CH353_4S,
60486042
PCI_ANY_ID, PCI_ANY_ID,
60496043
0, 0, pbn_b0_bt_4_115200 },
60506044

6051-
{ PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH353_2S1PF,
6045+
{ PCI_VENDOR_ID_WCHCN, PCI_DEVICE_ID_WCHCN_CH353_2S1PF,
60526046
PCI_ANY_ID, PCI_ANY_ID,
60536047
0, 0, pbn_b0_bt_2_115200 },
60546048

6055-
{ PCI_VENDOR_ID_WCH, PCI_DEVICE_ID_WCH_CH355_4S,
6049+
{ PCI_VENDOR_ID_WCHCN, PCI_DEVICE_ID_WCHCN_CH355_4S,
60566050
PCI_ANY_ID, PCI_ANY_ID,
60576051
0, 0, pbn_b0_bt_4_115200 },
60586052

6059-
{ PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH382_2S,
6053+
{ PCI_VENDOR_ID_WCHIC, PCI_DEVICE_ID_WCHIC_CH382_2S,
60606054
PCI_ANY_ID, PCI_ANY_ID,
60616055
0, 0, pbn_wch382_2 },
60626056

6063-
{ PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH384_4S,
6057+
{ PCI_VENDOR_ID_WCHIC, PCI_DEVICE_ID_WCHIC_CH384_4S,
60646058
PCI_ANY_ID, PCI_ANY_ID,
60656059
0, 0, pbn_wch384_4 },
60666060

6067-
{ PCIE_VENDOR_ID_WCH, PCIE_DEVICE_ID_WCH_CH384_8S,
6061+
{ PCI_VENDOR_ID_WCHIC, PCI_DEVICE_ID_WCHIC_CH384_8S,
60686062
PCI_ANY_ID, PCI_ANY_ID,
60696063
0, 0, pbn_wch384_8 },
60706064
/*

0 commit comments

Comments
 (0)