Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: serial: add support for various Titan PCI cards vt_ioctl: return -EFAULT on copy_from_user errors serial: altera_uart: Proper section for altera_uart_remove tty: fix a little bug in scrup, vt.c altera_uart: Simplify altera_uart_console_putc altera_uart: Don't take spinlock in already protected functions TTY/n_gsm: potential double lock serial: bfin_5xx: fix typo in IER check serial: bfin_5xx: IRDA is not affected by anomaly 05000230 serial_cs: add and sort IDs for serial and modem cards msm_serial: fix serial on trout

Linus Torvalds committed 16 years ago

Commit bf4282c2 parents d7940b0 66169ad9 files · +175 −59Browse files

Unified · Split

9 files

drivers/char/n_gsm.c +5 −4
drivers/char/vt.c +1 −1
drivers/char/vt_ioctl.c +3 −1
drivers/serial/8250_pci.c +71 −0
drivers/serial/altera_uart.c +13 −31
drivers/serial/bfin_5xx.c +7 −2
drivers/serial/msm_serial.c +3 −18
drivers/serial/msm_serial.h +56 −0
drivers/serial/serial_cs.c +16 −2

drivers/char/n_gsm.c+5−4

@@ -904,9 +904,7 @@ static void gsm_dlci_data_sweep(struct gsm_mux *gsm) · 903 unmodified lines
904	904	int len;
905	905	/* Priority ordering: We should do priority with RR of the groups */
906	906	int i = 1;
907		− unsigned long flags;
908	907
909		− spin_lock_irqsave(&gsm->tx_lock, flags);
910	908	while (i < NUM_DLCI) {
911	909	struct gsm_dlci *dlci;
912	910
@@ -927,7 +925,6 @@ static void gsm_dlci_data_sweep(struct gsm_mux *gsm) · 14 unmodified lines
927	925	if (len == 0)
928	926	i++;
929	927	}
930		− spin_unlock_irqrestore(&gsm->tx_lock, flags);
931	928	}
932	929
933	930	/**
@@ -2230,12 +2227,16 @@ static int gsmld_open(struct tty_struct *tty) · 1296 unmodified lines
2230	2227	static void gsmld_write_wakeup(struct tty_struct *tty)
2231	2228	{
2232	2229	struct gsm_mux *gsm = tty->disc_data;
	2230	+ unsigned long flags;
2233	2231
2234	2232	/* Queue poll */
2235	2233	clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
2236	2234	gsm_data_kick(gsm);
2237		− if (gsm->tx_bytes < TX_THRESH_LO)
	2235	+ if (gsm->tx_bytes < TX_THRESH_LO) {
	2236	+ spin_lock_irqsave(&gsm->tx_lock, flags);
2238	2237	gsm_dlci_data_sweep(gsm);
	2238	+ spin_unlock_irqrestore(&gsm->tx_lock, flags);
	2239	+ }
2239	2240	}
2240	2241
2241	2242	/**

drivers/char/vt.c+1−1

@@ -304,7 +304,7 @@ static void scrup(struct vc_data *vc, unsigned int t, unsigned int b, int nr) · 303 unmodified lines
304	304	d = (unsigned short )(vc->vc_origin + vc->vc_size_row t);
305	305	s = (unsigned short )(vc->vc_origin + vc->vc_size_row (t + nr));
306	306	scr_memmovew(d, s, (b - t - nr) * vc->vc_size_row);
307		− scr_memsetw(d + (b - t - nr) * vc->vc_cols, vc->vc_video_erase_char,
	307	+ scr_memsetw(d + (b - t - nr) * vc->vc_size_row, vc->vc_video_erase_char,
308	308	vc->vc_size_row * nr);
309	309	}
310	310

drivers/char/vt_ioctl.c+3−1

@@ -1303,7 +1303,9 @@ int vt_ioctl(struct tty_struct tty, struct file file, · 1302 unmodified lines
1303	1303	if (!perm)
1304	1304	goto eperm;
1305	1305	ret = copy_from_user(&ui, up, sizeof(struct unimapinit));
1306		− if (!ret)
	1306	+ if (ret)
	1307	+ ret = -EFAULT;
	1308	+ else
1307	1309	con_clear_unimap(vc, &ui);
1308	1310	break;
1309	1311	}

drivers/serial/8250_pci.c+71−0

@@ -982,6 +982,18 @@ static int skip_tx_en_setup(struct serial_private *priv, · 981 unmodified lines
982	982	#define PCI_SUBDEVICE_ID_POCTAL422 0x0408
983	983	#define PCI_VENDOR_ID_ADVANTECH 0x13fe
984	984	#define PCI_DEVICE_ID_ADVANTECH_PCI3620 0x3620
	985	+#define PCI_DEVICE_ID_TITAN_200I 0x8028
	986	+#define PCI_DEVICE_ID_TITAN_400I 0x8048
	987	+#define PCI_DEVICE_ID_TITAN_800I 0x8088
	988	+#define PCI_DEVICE_ID_TITAN_800EH 0xA007
	989	+#define PCI_DEVICE_ID_TITAN_800EHB 0xA008
	990	+#define PCI_DEVICE_ID_TITAN_400EH 0xA009
	991	+#define PCI_DEVICE_ID_TITAN_100E 0xA010
	992	+#define PCI_DEVICE_ID_TITAN_200E 0xA012
	993	+#define PCI_DEVICE_ID_TITAN_400E 0xA013
	994	+#define PCI_DEVICE_ID_TITAN_800E 0xA014
	995	+#define PCI_DEVICE_ID_TITAN_200EI 0xA016
	996	+#define PCI_DEVICE_ID_TITAN_200EISI 0xA017
985	997
986	998	/* Unknown vendors/cards - this should not be in linux/pci_ids.h */
987	999	#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584
@@ -1541,6 +1553,10 @@ enum pci_board_num_t { · 553 unmodified lines
1541	1553	pbn_b3_4_115200,
1542	1554	pbn_b3_8_115200,
1543	1555
	1556	+ pbn_b4_bt_2_921600,
	1557	+ pbn_b4_bt_4_921600,
	1558	+ pbn_b4_bt_8_921600,
	1559	+
1544	1560	/*
1545	1561	* Board-specific versions.
1546	1562	*/
@@ -1995,6 +2011,25 @@ static struct pciserial_board pci_boards[] __devinitdata = { · 448 unmodified lines
1995	2011	.uart_offset = 8,
1996	2012	},
1997	2013
	2014	+ [pbn_b4_bt_2_921600] = {
	2015	+ .flags = FL_BASE4,
	2016	+ .num_ports = 2,
	2017	+ .base_baud = 921600,
	2018	+ .uart_offset = 8,
	2019	+ },
	2020	+ [pbn_b4_bt_4_921600] = {
	2021	+ .flags = FL_BASE4,
	2022	+ .num_ports = 4,
	2023	+ .base_baud = 921600,
	2024	+ .uart_offset = 8,
	2025	+ },
	2026	+ [pbn_b4_bt_8_921600] = {
	2027	+ .flags = FL_BASE4,
	2028	+ .num_ports = 8,
	2029	+ .base_baud = 921600,
	2030	+ .uart_offset = 8,
	2031	+ },
	2032	+
1998	2033	/*
1999	2034	* Entries following this are board-specific.
2000	2035	*/
@@ -3043,6 +3078,42 @@ static struct pci_device_id serial_pci_tbl[] = { · 1042 unmodified lines
3043	3078	{ PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800L,
3044	3079	PCI_ANY_ID, PCI_ANY_ID, 0, 0,
3045	3080	pbn_b0_bt_8_921600 },
	3081	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200I,
	3082	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3083	+ pbn_b4_bt_2_921600 },
	3084	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400I,
	3085	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3086	+ pbn_b4_bt_4_921600 },
	3087	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800I,
	3088	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3089	+ pbn_b4_bt_8_921600 },
	3090	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400EH,
	3091	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3092	+ pbn_b0_4_921600 },
	3093	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800EH,
	3094	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3095	+ pbn_b0_4_921600 },
	3096	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800EHB,
	3097	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3098	+ pbn_b0_4_921600 },
	3099	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100E,
	3100	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3101	+ pbn_oxsemi_1_4000000 },
	3102	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200E,
	3103	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3104	+ pbn_oxsemi_2_4000000 },
	3105	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400E,
	3106	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3107	+ pbn_oxsemi_4_4000000 },
	3108	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800E,
	3109	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3110	+ pbn_oxsemi_8_4000000 },
	3111	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EI,
	3112	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3113	+ pbn_oxsemi_2_4000000 },
	3114	+ { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EISI,
	3115	+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
	3116	+ pbn_oxsemi_2_4000000 },
3046	3117
3047	3118	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_550,
3048	3119	PCI_ANY_ID, PCI_ANY_ID, 0, 0,

drivers/serial/altera_uart.c+13−31

@@ -89,15 +89,12 @@ static unsigned int altera_uart_tx_empty(struct uart_port *port) · 88 unmodified lines
89	89	static unsigned int altera_uart_get_mctrl(struct uart_port *port)
90	90	{
91	91	struct altera_uart *pp = container_of(port, struct altera_uart, port);
92		− unsigned long flags;
93	92	unsigned int sigs;
94	93
95		− spin_lock_irqsave(&port->lock, flags);
96	94	sigs =
97	95	(readl(port->membase + ALTERA_UART_STATUS_REG) &
98	96	ALTERA_UART_STATUS_CTS_MSK) ? TIOCM_CTS : 0;
99	97	sigs \|= (pp->sigs & TIOCM_RTS);
100		− spin_unlock_irqrestore(&port->lock, flags);
101	98
102	99	return sigs;
103	100	}
@@ -105,49 +102,37 @@ static unsigned int altera_uart_get_mctrl(struct uart_port *port) · 1 unmodified line
105	102	static void altera_uart_set_mctrl(struct uart_port *port, unsigned int sigs)
106	103	{
107	104	struct altera_uart *pp = container_of(port, struct altera_uart, port);
108		− unsigned long flags;
109	105
110		− spin_lock_irqsave(&port->lock, flags);
111	106	pp->sigs = sigs;
112	107	if (sigs & TIOCM_RTS)
113	108	pp->imr \|= ALTERA_UART_CONTROL_RTS_MSK;
114	109	else
115	110	pp->imr &= ~ALTERA_UART_CONTROL_RTS_MSK;
116	111	writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);
117		− spin_unlock_irqrestore(&port->lock, flags);
118	112	}
119	113
120	114	static void altera_uart_start_tx(struct uart_port *port)
121	115	{
122	116	struct altera_uart *pp = container_of(port, struct altera_uart, port);
123		− unsigned long flags;
124	117
125		− spin_lock_irqsave(&port->lock, flags);
126	118	pp->imr \|= ALTERA_UART_CONTROL_TRDY_MSK;
127	119	writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);
128		− spin_unlock_irqrestore(&port->lock, flags);
129	120	}
130	121
131	122	static void altera_uart_stop_tx(struct uart_port *port)
132	123	{
133	124	struct altera_uart *pp = container_of(port, struct altera_uart, port);
134		− unsigned long flags;
135	125
136		− spin_lock_irqsave(&port->lock, flags);
137	126	pp->imr &= ~ALTERA_UART_CONTROL_TRDY_MSK;
138	127	writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);
139		− spin_unlock_irqrestore(&port->lock, flags);
140	128	}
141	129
142	130	static void altera_uart_stop_rx(struct uart_port *port)
143	131	{
144	132	struct altera_uart *pp = container_of(port, struct altera_uart, port);
145		− unsigned long flags;
146	133
147		− spin_lock_irqsave(&port->lock, flags);
148	134	pp->imr &= ~ALTERA_UART_CONTROL_RRDY_MSK;
149	135	writel(pp->imr, port->membase + ALTERA_UART_CONTROL_REG);
150		− spin_unlock_irqrestore(&port->lock, flags);
151	136	}
152	137
153	138	static void altera_uart_break_ctl(struct uart_port *port, int break_state)
@@ -272,10 +257,14 @@ static irqreturn_t altera_uart_interrupt(int irq, void *data) · 118 unmodified lines
272	257	unsigned int isr;
273	258
274	259	isr = readl(port->membase + ALTERA_UART_STATUS_REG) & pp->imr;
	260	+
	261	+ spin_lock(&port->lock);
275	262	if (isr & ALTERA_UART_STATUS_RRDY_MSK)
276	263	altera_uart_rx_chars(pp);
277	264	if (isr & ALTERA_UART_STATUS_TRDY_MSK)
278	265	altera_uart_tx_chars(pp);
	266	+ spin_unlock(&port->lock);
	267	+
279	268	return IRQ_RETVAL(isr);
280	269	}
281	270
@@ -402,31 +391,24 @@ int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp) · 120 unmodified lines
402	391	return 0;
403	392	}
404	393
405		−static void altera_uart_console_putc(struct console *co, const char c)
	394	+static void altera_uart_console_putc(struct uart_port *port, const char c)
406	395	{
407		− struct uart_port *port = &(altera_uart_ports + co->index)->port;
408		− int i;
	396	+ while (!(readl(port->membase + ALTERA_UART_STATUS_REG) &
	397	+ ALTERA_UART_STATUS_TRDY_MSK))
	398	+ cpu_relax();
409	399
410		− for (i = 0; i < 0x10000; i++) {
411		− if (readl(port->membase + ALTERA_UART_STATUS_REG) &
412		− ALTERA_UART_STATUS_TRDY_MSK)
413		− break;
414		− }
415	400	writel(c, port->membase + ALTERA_UART_TXDATA_REG);
416		− for (i = 0; i < 0x10000; i++) {
417		− if (readl(port->membase + ALTERA_UART_STATUS_REG) &
418		− ALTERA_UART_STATUS_TRDY_MSK)
419		− break;
420		− }
421	401	}
422	402
423	403	static void altera_uart_console_write(struct console co, const char s,
424	404	unsigned int count)
425	405	{
	406	+ struct uart_port *port = &(altera_uart_ports + co->index)->port;
	407	+
426	408	for (; count; count--, s++) {
427		− altera_uart_console_putc(co, *s);
	409	+ altera_uart_console_putc(port, *s);
428	410	if (*s == '\n')
429		− altera_uart_console_putc(co, '\r');
	411	+ altera_uart_console_putc(port, '\r');
430	412	}
431	413	}
432	414
@@ -516,7 +498,7 @@ static int __devinit altera_uart_probe(struct platform_device *pdev) · 83 unmodified lines
516	498	return 0;
517	499	}
518	500
519		−static int altera_uart_remove(struct platform_device *pdev)
	501	+static int __devexit altera_uart_remove(struct platform_device *pdev)
520	502	{
521	503	struct uart_port *port;
522	504	int i;

drivers/serial/bfin_5xx.c+7−2

@@ -797,7 +797,7 @@ static void bfin_serial_shutdown(struct uart_port *port) · 796 unmodified lines
797	797	gpio_free(uart->rts_pin);
798	798	#endif
799	799	#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
800		− if (UART_GET_IER(uart) && EDSSI)
	800	+ if (UART_GET_IER(uart) & EDSSI)
801	801	free_irq(uart->status_irq, uart);
802	802	#endif
803	803	}
@@ -869,7 +869,12 @@ bfin_serial_set_termios(struct uart_port port, struct ktermios termios, · 65 unmodified lines
869	869	}
870	870
871	871	baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
872		− quot = uart_get_divisor(port, baud) - ANOMALY_05000230;
	872	+ quot = uart_get_divisor(port, baud);
	873	+
	874	+ /* If discipline is not IRDA, apply ANOMALY_05000230 */
	875	+ if (termios->c_line != N_IRDA)
	876	+ quot -= ANOMALY_05000230;
	877	+
873	878	spin_lock_irqsave(&uart->port.lock, flags);
874	879
875	880	UART_SET_ANOMALY_THRESHOLD(uart, USEC_PER_SEC / baud * 15);

drivers/serial/msm_serial.c+3−18

@@ -41,19 +41,6 @@ struct msm_port { · 40 unmodified lines
41	41	unsigned int imr;
42	42	};
43	43
44		−#define UART_TO_MSM(uart_port) ((struct msm_port *) uart_port)
45		−
46		−static inline void msm_write(struct uart_port *port, unsigned int val,
47		− unsigned int off)
48		−{
49		− __raw_writel(val, port->membase + off);
50		−}
51		−
52		−static inline unsigned int msm_read(struct uart_port *port, unsigned int off)
53		−{
54		− return __raw_readl(port->membase + off);
55		−}
56		−
57	44	static void msm_stop_tx(struct uart_port *port)
58	45	{
59	46	struct msm_port *msm_port = UART_TO_MSM(port);
@@ -320,11 +307,7 @@ static void msm_init_clock(struct uart_port *port) · 260 unmodified lines
320	307	struct msm_port *msm_port = UART_TO_MSM(port);
321	308
322	309	clk_enable(msm_port->clk);
323		−
324		− msm_write(port, 0xC0, UART_MREG);
325		− msm_write(port, 0xB2, UART_NREG);
326		− msm_write(port, 0x7D, UART_DREG);
327		− msm_write(port, 0x1C, UART_MNDREG);
	310	+ msm_serial_set_mnd_regs(port);
328	311	}
329	312
330	313	static int msm_startup(struct uart_port *port)
@@ -706,6 +689,8 @@ static int __init msm_serial_probe(struct platform_device *pdev) · 375 unmodified lines
706	689	if (unlikely(IS_ERR(msm_port->clk)))
707	690	return PTR_ERR(msm_port->clk);
708	691	port->uartclk = clk_get_rate(msm_port->clk);
	692	+ printk(KERN_INFO "uartclk = %d\n", port->uartclk);
	693	+
709	694
710	695	resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
711	696	if (unlikely(!resource))

drivers/serial/msm_serial.h+56−0

@@ -114,4 +114,60 @@ · 113 unmodified lines
114	114	#define UART_MISR 0x0010
115	115	#define UART_ISR 0x0014
116	116
	117	+#define UART_TO_MSM(uart_port) ((struct msm_port *) uart_port)
	118	+
	119	+static inline
	120	+void msm_write(struct uart_port *port, unsigned int val, unsigned int off)
	121	+{
	122	+ __raw_writel(val, port->membase + off);
	123	+}
	124	+
	125	+static inline
	126	+unsigned int msm_read(struct uart_port *port, unsigned int off)
	127	+{
	128	+ return __raw_readl(port->membase + off);
	129	+}
	130	+
	131	+/*
	132	+ * Setup the MND registers to use the TCXO clock.
	133	+ */
	134	+static inline void msm_serial_set_mnd_regs_tcxo(struct uart_port *port)
	135	+{
	136	+ msm_write(port, 0x06, UART_MREG);
	137	+ msm_write(port, 0xF1, UART_NREG);
	138	+ msm_write(port, 0x0F, UART_DREG);
	139	+ msm_write(port, 0x1A, UART_MNDREG);
	140	+}
	141	+
	142	+/*
	143	+ * Setup the MND registers to use the TCXO clock divided by 4.
	144	+ */
	145	+static inline void msm_serial_set_mnd_regs_tcxoby4(struct uart_port *port)
	146	+{
	147	+ msm_write(port, 0x18, UART_MREG);
	148	+ msm_write(port, 0xF6, UART_NREG);
	149	+ msm_write(port, 0x0F, UART_DREG);
	150	+ msm_write(port, 0x0A, UART_MNDREG);
	151	+}
	152	+
	153	+static inline
	154	+void msm_serial_set_mnd_regs_from_uartclk(struct uart_port *port)
	155	+{
	156	+ if (port->uartclk == 19200000)
	157	+ msm_serial_set_mnd_regs_tcxo(port);
	158	+ else
	159	+ msm_serial_set_mnd_regs_tcxoby4(port);
	160	+}
	161	+
	162	+/*
	163	+ * TROUT has a specific defect that makes it report it's uartclk
	164	+ * as 19.2Mhz (TCXO) when it's actually 4.8Mhz (TCXO/4). This special
	165	+ * cases TROUT to use the right clock.
	166	+ */
	167	+#ifdef CONFIG_MACH_TROUT
	168	+#define msm_serial_set_mnd_regs msm_serial_set_mnd_regs_tcxoby4
	169	+#else
	170	+#define msm_serial_set_mnd_regs msm_serial_set_mnd_regs_from_uartclk
	171	+#endif
	172	+
117	173	#endif /* __DRIVERS_SERIAL_MSM_SERIAL_H */

drivers/serial/serial_cs.c+16−2

@@ -715,6 +715,8 @@ static struct pcmcia_device_id serial_ids[] = { · 714 unmodified lines
715	715	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0057, 0x0021),
716	716	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0089, 0x110a),
717	717	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0104, 0x000a),
	718	+ PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a),
	719	+ PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a),
718	720	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0xea15),
719	721	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0109, 0x0501),
720	722	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0138, 0x110a),
@@ -724,8 +726,6 @@ static struct pcmcia_device_id serial_ids[] = { · 3 unmodified lines
724	726	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x016c, 0x0081),
725	727	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x021b, 0x0101),
726	728	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x08a1, 0xc0ab),
727		− PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0d0a),
728		− PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0105, 0x0e0a),
729	729	PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3288", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x04cd2988, 0x46a52d63),
730	730	PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "CC/XJEM3336", "DATA/FAX/CELL ETHERNET MODEM", 0xf510db04, 0x0143b773, 0x46a52d63),
731	731	PCMCIA_PFC_DEVICE_PROD_ID123(1, "MEGAHERTZ", "EM1144T", "PCMCIA MODEM", 0xf510db04, 0x856d66c8, 0xbd6c43ef),
@@ -768,17 +768,26 @@ static struct pcmcia_device_id serial_ids[] = { · 36 unmodified lines
768	768	PCMCIA_DEVICE_MANF_CARD(0x00a4, 0x0276),
769	769	PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0039),
770	770	PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0006),
	771	+ PCMCIA_DEVICE_MANF_CARD(0x0105, 0x0101), /* TDK DF2814 */
	772	+ PCMCIA_DEVICE_MANF_CARD(0x0105, 0x100a), /* Xircom CM-56G */
	773	+ PCMCIA_DEVICE_MANF_CARD(0x0105, 0x3e0a), /* TDK DF5660 */
771	774	PCMCIA_DEVICE_MANF_CARD(0x0105, 0x410a),
	775	+ PCMCIA_DEVICE_MANF_CARD(0x0107, 0x0002), /* USRobotics 14,400 */
772	776	PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d50),
773	777	PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d51),
774	778	PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d52),
775	779	PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0d53),
776	780	PCMCIA_DEVICE_MANF_CARD(0x010b, 0xd180),
	781	+ PCMCIA_DEVICE_MANF_CARD(0x0115, 0x3330), /* USRobotics/SUN 14,400 */
	782	+ PCMCIA_DEVICE_MANF_CARD(0x0124, 0x0100), /* Nokia DTP-2 ver II */
	783	+ PCMCIA_DEVICE_MANF_CARD(0x0134, 0x5600), /* LASAT COMMUNICATIONS A/S */
777	784	PCMCIA_DEVICE_MANF_CARD(0x0137, 0x000e),
778	785	PCMCIA_DEVICE_MANF_CARD(0x0137, 0x001b),
779	786	PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0025),
780	787	PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0045),
781	788	PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0052),
	789	+ PCMCIA_DEVICE_MANF_CARD(0x016c, 0x0006), /* Psion 56K+Fax */
	790	+ PCMCIA_DEVICE_MANF_CARD(0x0200, 0x0001), /* MultiMobile */
782	791	PCMCIA_DEVICE_PROD_ID134("ADV", "TECH", "COMpad-32/85", 0x67459937, 0x916d02ba, 0x8fbe92ae),
783	792	PCMCIA_DEVICE_PROD_ID124("GATEWAY2000", "CC3144", "PCMCIA MODEM", 0x506bccae, 0xcb3685f1, 0xbd6c43ef),
784	793	PCMCIA_DEVICE_PROD_ID14("MEGAHERTZ", "PCMCIA MODEM", 0xf510db04, 0xbd6c43ef),
@@ -792,16 +801,21 @@ static struct pcmcia_device_id serial_ids[] = { · 7 unmodified lines
792	801	PCMCIA_DEVICE_PROD_ID12("COMPAQ", "PCMCIA 33600 FAX/DATA MODEM", 0xa3a3062c, 0x5a00ce95),
793	802	PCMCIA_DEVICE_PROD_ID12("Computerboards, Inc.", "PCM-COM422", 0xd0b78f51, 0x7e2d49ed),
794	803	PCMCIA_DEVICE_PROD_ID12("Dr. Neuhaus", "FURY CARD 14K4", 0x76942813, 0x8b96ce65),
	804	+ PCMCIA_DEVICE_PROD_ID12("IBM", "ISDN/56K/GSM", 0xb569a6e5, 0xfee5297b),
795	805	PCMCIA_DEVICE_PROD_ID12("Intelligent", "ANGIA FAX/MODEM", 0xb496e65e, 0xf31602a6),
796	806	PCMCIA_DEVICE_PROD_ID12("Intel", "MODEM 2400+", 0x816cc815, 0x412729fb),
	807	+ PCMCIA_DEVICE_PROD_ID12("Intertex", "IX34-PCMCIA", 0xf8a097e3, 0x97880447),
797	808	PCMCIA_DEVICE_PROD_ID12("IOTech Inc ", "PCMCIA Dual RS-232 Serial Port Card", 0x3bd2d898, 0x92abc92f),
798	809	PCMCIA_DEVICE_PROD_ID12("MACRONIX", "FAX/MODEM", 0x668388b3, 0x3f9bdf2f),
799	810	PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT1432LT", 0x5f73be51, 0x0b3e2383),
800	811	PCMCIA_DEVICE_PROD_ID12("Multi-Tech", "MT2834LT", 0x5f73be51, 0x4cd7c09e),
801	812	PCMCIA_DEVICE_PROD_ID12("OEM ", "C288MX ", 0xb572d360, 0xd2385b7a),
	813	+ PCMCIA_DEVICE_PROD_ID12("Option International", "V34bis GSM/PSTN Data/Fax Modem", 0x9d7cd6f5, 0x5cb8bf41),
802	814	PCMCIA_DEVICE_PROD_ID12("PCMCIA ", "C336MX ", 0x99bcafe9, 0xaa25bcab),
803	815	PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "PCMCIA Dual RS-232 Serial Port Card", 0xc4420b35, 0x92abc92f),
804	816	PCMCIA_DEVICE_PROD_ID12("Quatech Inc", "Dual RS-232 Serial Port PC Card", 0xc4420b35, 0x031a380d),
	817	+ PCMCIA_DEVICE_PROD_ID12("Telia", "SurfinBird 560P/A+", 0xe2cdd5e, 0xc9314b38),
	818	+ PCMCIA_DEVICE_PROD_ID1("Smart Serial Port", 0x2d8ce292),
805	819	PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "EN2218-LAN/MODEM", 0x281f1c5d, 0x570f348e, "cis/PCMLM28.cis"),
806	820	PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "PCMCIA", "UE2218-LAN/MODEM", 0x281f1c5d, 0x6fdcacee, "cis/PCMLM28.cis"),
807	821	PCMCIA_PFC_DEVICE_CIS_PROD_ID12(1, "Psion Dacom", "Gold Card V34 Ethernet", 0xf5f025c2, 0x338e8155, "cis/PCMLM28.cis"),

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code