Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9629953 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-serial 

* master.kernel.org:/home/rmk/linux-2.6-serial:
  [SERIAL] Support for Intashield 2 port PCI serial card
parents 1b8b22f4 737c1756

drivers/serial/8250_pci.c

+14 −0
Original line number Diff line number Diff line
@@ -936,6 +936,7 @@ enum pci_board_num_t { 
	pbn_b1_8_1382400,



	pbn_b2_1_115200,

	pbn_b2_2_115200,

	pbn_b2_8_115200,



	pbn_b2_1_460800,
@@ -1243,6 +1244,12 @@ static struct pciserial_board pci_boards[] __devinitdata = { 
		.base_baud	= 115200,

		.uart_offset	= 8,

	},

	[pbn_b2_2_115200] = {

		.flags		= FL_BASE2,

		.num_ports	= 2,

		.base_baud	= 115200,

		.uart_offset	= 8,

	},

	[pbn_b2_8_115200] = {

		.flags		= FL_BASE2,

		.num_ports	= 8,
@@ -2339,6 +2346,13 @@ static struct pci_device_id serial_pci_tbl[] = { 
		PCI_ANY_ID, PCI_ANY_ID, 0, 0,

		pbn_b0_1_115200 },



	/*

	 * IntaShield IS-200

	 */

	{	PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0,	/* 135a.0811 */

		pbn_b2_2_115200 },



	/*

	 * These entries match devices with class COMMUNICATION_SERIAL,

	 * COMMUNICATION_MODEM or COMMUNICATION_MULTISERIAL

include/linux/pci_ids.h

+3 −0
Original line number Diff line number Diff line
@@ -1726,6 +1726,9 @@ 
#define PCI_VENDOR_ID_DOMEX		0x134a

#define PCI_DEVICE_ID_DOMEX_DMX3191D	0x0001



#define PCI_VENDOR_ID_INTASHIELD	0x135a

#define PCI_DEVICE_ID_INTASHIELD_IS200	0x0d80



#define PCI_VENDOR_ID_QUATECH		0x135C

#define PCI_DEVICE_ID_QUATECH_QSC100	0x0010

#define PCI_DEVICE_ID_QUATECH_DSC100	0x0020