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

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

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 

* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (26 commits)
  amba pl011: workaround for uart registers lockup
  n_gsm: fix the wrong FCS handling
  pch_uart: add missing comment about OKI ML7223
  pch_uart: Add MSI support
  tty: fix "IRQ45: nobody cared"
  PTI feature to allow user to name and mark masterchannel request.
  0 for o PTI Makefile bug.
  tty: serial: samsung.c remove legacy PM code.
  SERIAL: SC26xx: Fix link error.
  serial: mrst_max3110: initialize waitqueue earlier
  mrst_max3110: Change max missing message priority.
  tty: s5pv210: Add delay loop on fifo reset function for UART
  tty/serial: Fix XSCALE serial ports, e.g. ce4100
  serial: bfin_5xx: fix off-by-one with resource size
  drivers/tty: use printk_ratelimited() instead of printk_ratelimit()
  tty: n_gsm: Added refcount usage to gsm_mux and gsm_dlci structs
  tty: n_gsm: Add raw-ip support
  tty: n_gsm: expose gsmtty device nodes at ldisc open time
  pch_phub: Fix register miss-setting issue
  serial: 8250, increase PASS_LIMIT
  ...
parents f549953c def90f42

drivers/misc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ obj-$(CONFIG_IBM_ASM) += ibmasm/ 
obj-$(CONFIG_AD525X_DPOT)	+= ad525x_dpot.o

obj-$(CONFIG_AD525X_DPOT_I2C)	+= ad525x_dpot-i2c.o

obj-$(CONFIG_AD525X_DPOT_SPI)	+= ad525x_dpot-spi.o

0bj-$(CONFIG_INTEL_MID_PTI)	+= pti.o

obj-$(CONFIG_INTEL_MID_PTI)	+= pti.o

obj-$(CONFIG_ATMEL_PWM)		+= atmel_pwm.o

obj-$(CONFIG_ATMEL_SSC)		+= atmel-ssc.o

obj-$(CONFIG_ATMEL_TCLIB)	+= atmel_tclib.o

drivers/misc/pch_phub.c

+2 −2
Original line number Diff line number Diff line
@@ -735,6 +735,8 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev, 
		 * Device8(GbE)

		 */

		iowrite32(0x000a0000, chip->pch_phub_base_address + 0x14);

		/* set the interrupt delay value */

		iowrite32(0x25, chip->pch_phub_base_address + 0x140);

		chip->pch_opt_rom_start_address =\

						 PCH_PHUB_ROM_START_ADDR_ML7223;

		chip->pch_mac_start_address = PCH_PHUB_MAC_START_ADDR_ML7223;
@@ -752,8 +754,6 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev, 
		 * Device6(SATA 2):f

		 */

		iowrite32(0x0000ffa0, chip->pch_phub_base_address + 0x14);

		/* set the interrupt delay value */

		iowrite32(0x25, chip->pch_phub_base_address + 0x140);

		chip->pch_opt_rom_start_address =\

						 PCH_PHUB_ROM_START_ADDR_ML7223;

		chip->pch_mac_start_address = PCH_PHUB_MAC_START_ADDR_ML7223;

drivers/misc/pti.c

+60 −39
Original line number Diff line number Diff line
@@ -148,23 +148,28 @@ static void pti_write_to_aperture(struct pti_masterchannel *mc, 
 *

 *  @mc:          The master / channel structure on which the function

 *                built a control frame.

 *  @thread_name: The thread name associated with the master / channel or

 *                'NULL' if using the 'current' global variable.

 *

 *  To be able to post process the PTI contents on host side, a control frame

 *  is added before sending any PTI content. So the host side knows on

 *  each PTI frame the name of the thread using a dedicated master / channel.

 *  The thread name is retrieved from the 'current' global variable.

 *  The thread name is retrieved from 'current' global variable if 'thread_name'

 *  is 'NULL', else it is retrieved from 'thread_name' parameter.

 *  This function builds this frame and sends it to a master ID CONTROL_ID.

 *  The overhead is only 32 bytes since the driver only writes to HW

 *  in 32 byte chunks.

 */



static void pti_control_frame_built_and_sent(struct pti_masterchannel *mc)

static void pti_control_frame_built_and_sent(struct pti_masterchannel *mc,

					     const char *thread_name)

{

	struct pti_masterchannel mccontrol = {.master = CONTROL_ID,

					      .channel = 0};

	const char *thread_name_p;

	const char *control_format = "%3d %3d %s";

	u8 control_frame[CONTROL_FRAME_LEN];



	if (!thread_name) {

		/*

		 * Since we access the comm member in current's task_struct,

		 * we only need to be as large as what 'comm' in that
@@ -179,12 +184,16 @@ static void pti_control_frame_built_and_sent(struct pti_masterchannel *mc) 


		/* Absolutely ensure our buffer is zero terminated. */

		comm[TASK_COMM_LEN-1] = 0;

		thread_name_p = comm;

	} else {

		thread_name_p = thread_name;

	}



	mccontrol.channel = pti_control_channel;

	pti_control_channel = (pti_control_channel + 1) & 0x7f;



	snprintf(control_frame, CONTROL_FRAME_LEN, control_format, mc->master,

		mc->channel, comm);

		mc->channel, thread_name_p);

	pti_write_to_aperture(&mccontrol, control_frame, strlen(control_frame));

}
@@ -206,7 +215,7 @@ static void pti_write_full_frame_to_aperture(struct pti_masterchannel *mc, 
						const unsigned char *buf,

						int len)

{

	pti_control_frame_built_and_sent(mc);

	pti_control_frame_built_and_sent(mc, NULL);

	pti_write_to_aperture(mc, (u8 *)buf, len);

}
@@ -218,6 +227,8 @@ static void pti_write_full_frame_to_aperture(struct pti_masterchannel *mc, 
 * @max_ids:     The max amount of available write IDs to use.

 * @base_id:     The starting SW channel ID, based on the Intel

 *               PTI arch.

 * @thread_name: The thread name associated with the master / channel or

 *               'NULL' if using the 'current' global variable.

 *

 * Returns:

 *	pti_masterchannel struct with master, channel ID address
@@ -227,7 +238,10 @@ static void pti_write_full_frame_to_aperture(struct pti_masterchannel *mc, 
 * channel id. The bit is one if the id is taken and 0 if free. For

 * every master there are 128 channel id's.

 */

static struct pti_masterchannel *get_id(u8 *id_array, int max_ids, int base_id)

static struct pti_masterchannel *get_id(u8 *id_array,

					int max_ids,

					int base_id,

					const char *thread_name)

{

	struct pti_masterchannel *mc;

	int i, j, mask;
@@ -257,7 +271,7 @@ static struct pti_masterchannel *get_id(u8 *id_array, int max_ids, int base_id) 
	mc->master  = base_id;

	mc->channel = ((i & 0xf)<<3) + j;

	/* write new master Id / channel Id allocation to channel control */

	pti_control_frame_built_and_sent(mc);

	pti_control_frame_built_and_sent(mc, thread_name);

	return mc;

}
@@ -273,18 +287,22 @@ static struct pti_masterchannel *get_id(u8 *id_array, int max_ids, int base_id) 
 *				a master, channel ID address

 *				to write to PTI HW.

 *

 * @type: 0- request Application  master, channel aperture ID write address.

 * @type:        0- request Application  master, channel aperture ID

 *                  write address.

 *               1- request OS master, channel aperture ID write

 *                  address.

 *               2- request Modem master, channel aperture ID

 *                  write address.

 *               Other values, error.

 * @thread_name: The thread name associated with the master / channel or

 *               'NULL' if using the 'current' global variable.

 *

 * Returns:

 *	pti_masterchannel struct

 *	0 for error

 */

struct pti_masterchannel *pti_request_masterchannel(u8 type)

struct pti_masterchannel *pti_request_masterchannel(u8 type,

						    const char *thread_name)

{

	struct pti_masterchannel *mc;
@@ -293,15 +311,18 @@ struct pti_masterchannel *pti_request_masterchannel(u8 type) 
	switch (type) {



	case 0:

		mc = get_id(drv_data->ia_app, MAX_APP_IDS, APP_BASE_ID);

		mc = get_id(drv_data->ia_app, MAX_APP_IDS,

			    APP_BASE_ID, thread_name);

		break;



	case 1:

		mc = get_id(drv_data->ia_os, MAX_OS_IDS, OS_BASE_ID);

		mc = get_id(drv_data->ia_os, MAX_OS_IDS,

			    OS_BASE_ID, thread_name);

		break;



	case 2:

		mc = get_id(drv_data->ia_modem, MAX_MODEM_IDS, MODEM_BASE_ID);

		mc = get_id(drv_data->ia_modem, MAX_MODEM_IDS,

			    MODEM_BASE_ID, thread_name);

		break;

	default:

		mc = NULL;
@@ -472,9 +493,9 @@ static int pti_tty_install(struct tty_driver *driver, struct tty_struct *tty) 
			return -ENOMEM;



		if (idx == PTITTY_MINOR_START)

			pti_tty_data->mc = pti_request_masterchannel(0);

			pti_tty_data->mc = pti_request_masterchannel(0, NULL);

		else

			pti_tty_data->mc = pti_request_masterchannel(2);

			pti_tty_data->mc = pti_request_masterchannel(2, NULL);



		if (pti_tty_data->mc == NULL) {

			kfree(pti_tty_data);
@@ -563,7 +584,7 @@ static int pti_char_open(struct inode *inode, struct file *filp) 
	 * before assigning the value to filp->private_data.

	 * Slightly easier to debug if this driver needs debugging.

	 */

	mc = pti_request_masterchannel(0);

	mc = pti_request_masterchannel(0, NULL);

	if (mc == NULL)

		return -ENOMEM;

	filp->private_data = mc;

drivers/parport/parport_pc.c

+0 −54
Original line number Diff line number Diff line
@@ -2864,24 +2864,6 @@ enum parport_pc_pci_cards { 
	lava_parallel_dual_b,

	boca_ioppar,

	plx_9050,

	timedia_4078a,

	timedia_4079h,

	timedia_4085h,

	timedia_4088a,

	timedia_4089a,

	timedia_4095a,

	timedia_4096a,

	timedia_4078u,

	timedia_4079a,

	timedia_4085u,

	timedia_4079r,

	timedia_4079s,

	timedia_4079d,

	timedia_4079e,

	timedia_4079f,

	timedia_9079a,

	timedia_9079b,

	timedia_9079c,

	timedia_4006a,

	timedia_4014,

	timedia_4008a,
@@ -2940,24 +2922,6 @@ static struct parport_pc_pci { 
	/* lava_parallel_dual_b */	{ 1, { { 0, -1 }, } },

	/* boca_ioppar */		{ 1, { { 0, -1 }, } },

	/* plx_9050 */			{ 2, { { 4, -1 }, { 5, -1 }, } },

	/* timedia_4078a */		{ 1, { { 2, -1 }, } },

	/* timedia_4079h */             { 1, { { 2, 3 }, } },

	/* timedia_4085h */             { 2, { { 2, -1 }, { 4, -1 }, } },

	/* timedia_4088a */             { 2, { { 2, 3 }, { 4, 5 }, } },

	/* timedia_4089a */             { 2, { { 2, 3 }, { 4, 5 }, } },

	/* timedia_4095a */             { 2, { { 2, 3 }, { 4, 5 }, } },

	/* timedia_4096a */             { 2, { { 2, 3 }, { 4, 5 }, } },

	/* timedia_4078u */             { 1, { { 2, -1 }, } },

	/* timedia_4079a */             { 1, { { 2, 3 }, } },

	/* timedia_4085u */             { 2, { { 2, -1 }, { 4, -1 }, } },

	/* timedia_4079r */             { 1, { { 2, 3 }, } },

	/* timedia_4079s */             { 1, { { 2, 3 }, } },

	/* timedia_4079d */             { 1, { { 2, 3 }, } },

	/* timedia_4079e */             { 1, { { 2, 3 }, } },

	/* timedia_4079f */             { 1, { { 2, 3 }, } },

	/* timedia_9079a */             { 1, { { 2, 3 }, } },

	/* timedia_9079b */             { 1, { { 2, 3 }, } },

	/* timedia_9079c */             { 1, { { 2, 3 }, } },

	/* timedia_4006a */             { 1, { { 0, -1 }, } },

	/* timedia_4014  */             { 2, { { 0, -1 }, { 2, -1 }, } },

	/* timedia_4008a */             { 1, { { 0, 1 }, } },
@@ -3019,24 +2983,6 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { 
	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,

	  PCI_SUBVENDOR_ID_EXSYS, PCI_SUBDEVICE_ID_EXSYS_4014, 0, 0, plx_9050 },

	/* PCI_VENDOR_ID_TIMEDIA/SUNIX has many differing cards ...*/

	{ 0x1409, 0x7168, 0x1409, 0x4078, 0, 0, timedia_4078a },

	{ 0x1409, 0x7168, 0x1409, 0x4079, 0, 0, timedia_4079h },

	{ 0x1409, 0x7168, 0x1409, 0x4085, 0, 0, timedia_4085h },

	{ 0x1409, 0x7168, 0x1409, 0x4088, 0, 0, timedia_4088a },

	{ 0x1409, 0x7168, 0x1409, 0x4089, 0, 0, timedia_4089a },

	{ 0x1409, 0x7168, 0x1409, 0x4095, 0, 0, timedia_4095a },

	{ 0x1409, 0x7168, 0x1409, 0x4096, 0, 0, timedia_4096a },

	{ 0x1409, 0x7168, 0x1409, 0x5078, 0, 0, timedia_4078u },

	{ 0x1409, 0x7168, 0x1409, 0x5079, 0, 0, timedia_4079a },

	{ 0x1409, 0x7168, 0x1409, 0x5085, 0, 0, timedia_4085u },

	{ 0x1409, 0x7168, 0x1409, 0x6079, 0, 0, timedia_4079r },

	{ 0x1409, 0x7168, 0x1409, 0x7079, 0, 0, timedia_4079s },

	{ 0x1409, 0x7168, 0x1409, 0x8079, 0, 0, timedia_4079d },

	{ 0x1409, 0x7168, 0x1409, 0x9079, 0, 0, timedia_4079e },

	{ 0x1409, 0x7168, 0x1409, 0xa079, 0, 0, timedia_4079f },

	{ 0x1409, 0x7168, 0x1409, 0xb079, 0, 0, timedia_9079a },

	{ 0x1409, 0x7168, 0x1409, 0xc079, 0, 0, timedia_9079b },

	{ 0x1409, 0x7168, 0x1409, 0xd079, 0, 0, timedia_9079c },

	{ 0x1409, 0x7268, 0x1409, 0x0101, 0, 0, timedia_4006a },

	{ 0x1409, 0x7268, 0x1409, 0x0102, 0, 0, timedia_4014 },

	{ 0x1409, 0x7268, 0x1409, 0x0103, 0, 0, timedia_4008a },

drivers/parport/parport_serial.c

+213 −16
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ enum parport_pc_pci_cards { 
	netmos_9xx5_combo,

	netmos_9855,

	netmos_9855_2p,

	netmos_9900,

	netmos_9900_2p,

	netmos_99xx_1p,

	avlab_1s1p,

	avlab_1s2p,

	avlab_2s1p,
@@ -41,6 +44,24 @@ enum parport_pc_pci_cards { 
	siig_2p1s_20x,

	siig_1s1p_20x,

	siig_2s1p_20x,

	timedia_4078a,

	timedia_4079h,

	timedia_4085h,

	timedia_4088a,

	timedia_4089a,

	timedia_4095a,

	timedia_4096a,

	timedia_4078u,

	timedia_4079a,

	timedia_4085u,

	timedia_4079r,

	timedia_4079s,

	timedia_4079d,

	timedia_4079e,

	timedia_4079f,

	timedia_9079a,

	timedia_9079b,

	timedia_9079c,

};



/* each element directly indexed from enum list, above */
@@ -72,6 +93,10 @@ static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc 
			dev->subsystem_vendor == PCI_VENDOR_ID_IBM &&

			dev->subsystem_device == 0x0299)

		return -ENODEV;



	if (dev->device == PCI_DEVICE_ID_NETMOS_9912) {

		par->numports = 1;

	} else {

		/*

		 * Netmos uses the subdevice ID to indicate the number of parallel

		 * and serial ports.  The form is 0x00PS, where <P> is the number of
@@ -80,14 +105,8 @@ static int __devinit netmos_parallel_init(struct pci_dev *dev, struct parport_pc 
		par->numports = (dev->subsystem_device & 0xf0) >> 4;

		if (par->numports > ARRAY_SIZE(par->addr))

			par->numports = ARRAY_SIZE(par->addr);

	/*

	 * This function is currently only called for cards with up to

	 * one parallel port.

	 * Parallel port BAR is either before or after serial ports BARS;

	 * hence, lo should be either 0 or equal to the number of serial ports.

	 */

	if (par->addr[0].lo != 0)

		par->addr[0].lo = dev->subsystem_device & 0xf;

	}



	return 0;

}
@@ -97,6 +116,9 @@ static struct parport_pc_pci cards[] __devinitdata = { 
	/* netmos_9xx5_combo */		{ 1, { { 2, -1 }, }, netmos_parallel_init },

	/* netmos_9855 */		{ 1, { { 0, -1 }, }, netmos_parallel_init },

	/* netmos_9855_2p */		{ 2, { { 0, -1 }, { 2, -1 }, } },

	/* netmos_9900 */		{1, { { 3, 4 }, }, netmos_parallel_init },

	/* netmos_9900_2p */		{2, { { 0, 1 }, { 3, 4 }, } },

	/* netmos_99xx_1p */		{1, { { 0, 1 }, } },

	/* avlab_1s1p     */		{ 1, { { 1, 2}, } },

	/* avlab_1s2p     */		{ 2, { { 1, 2}, { 3, 4 },} },

	/* avlab_2s1p     */		{ 1, { { 2, 3}, } },
@@ -105,6 +127,24 @@ static struct parport_pc_pci cards[] __devinitdata = { 
	/* siig_2p1s_20x */		{ 2, { { 1, 2 }, { 3, 4 }, } },

	/* siig_1s1p_20x */		{ 1, { { 1, 2 }, } },

	/* siig_2s1p_20x */		{ 1, { { 2, 3 }, } },

	/* timedia_4078a */		{ 1, { { 2, -1 }, } },

	/* timedia_4079h */             { 1, { { 2, 3 }, } },

	/* timedia_4085h */             { 2, { { 2, -1 }, { 4, -1 }, } },

	/* timedia_4088a */             { 2, { { 2, 3 }, { 4, 5 }, } },

	/* timedia_4089a */             { 2, { { 2, 3 }, { 4, 5 }, } },

	/* timedia_4095a */             { 2, { { 2, 3 }, { 4, 5 }, } },

	/* timedia_4096a */             { 2, { { 2, 3 }, { 4, 5 }, } },

	/* timedia_4078u */             { 1, { { 2, -1 }, } },

	/* timedia_4079a */             { 1, { { 2, 3 }, } },

	/* timedia_4085u */             { 2, { { 2, -1 }, { 4, -1 }, } },

	/* timedia_4079r */             { 1, { { 2, 3 }, } },

	/* timedia_4079s */             { 1, { { 2, 3 }, } },

	/* timedia_4079d */             { 1, { { 2, 3 }, } },

	/* timedia_4079e */             { 1, { { 2, 3 }, } },

	/* timedia_4079f */             { 1, { { 2, 3 }, } },

	/* timedia_9079a */             { 1, { { 2, 3 }, } },

	/* timedia_9079b */             { 1, { { 2, 3 }, } },

	/* timedia_9079c */             { 1, { { 2, 3 }, } },

};



static struct pci_device_id parport_serial_pci_tbl[] = {
@@ -127,6 +167,14 @@ static struct pci_device_id parport_serial_pci_tbl[] = { 
	  0x1000, 0x0022, 0, 0, netmos_9855_2p },

	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 },

	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,

	  0xA000, 0x3011, 0, 0, netmos_9900 },

	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,

	  0xA000, 0x3012, 0, 0, netmos_9900 },

	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9900,

	  0xA000, 0x3020, 0, 0, netmos_9900_2p },

	{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9912,

	  0xA000, 0x2000, 0, 0, netmos_99xx_1p },

	/* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/

	{ PCI_VENDOR_ID_AFAVLAB, 0x2110,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
@@ -176,6 +224,25 @@ static struct pci_device_id parport_serial_pci_tbl[] = { 
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },

	{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },

	/* PCI_VENDOR_ID_TIMEDIA/SUNIX has many differing cards ...*/

	{ 0x1409, 0x7168, 0x1409, 0x4078, 0, 0, timedia_4078a },

	{ 0x1409, 0x7168, 0x1409, 0x4079, 0, 0, timedia_4079h },

	{ 0x1409, 0x7168, 0x1409, 0x4085, 0, 0, timedia_4085h },

	{ 0x1409, 0x7168, 0x1409, 0x4088, 0, 0, timedia_4088a },

	{ 0x1409, 0x7168, 0x1409, 0x4089, 0, 0, timedia_4089a },

	{ 0x1409, 0x7168, 0x1409, 0x4095, 0, 0, timedia_4095a },

	{ 0x1409, 0x7168, 0x1409, 0x4096, 0, 0, timedia_4096a },

	{ 0x1409, 0x7168, 0x1409, 0x5078, 0, 0, timedia_4078u },

	{ 0x1409, 0x7168, 0x1409, 0x5079, 0, 0, timedia_4079a },

	{ 0x1409, 0x7168, 0x1409, 0x5085, 0, 0, timedia_4085u },

	{ 0x1409, 0x7168, 0x1409, 0x6079, 0, 0, timedia_4079r },

	{ 0x1409, 0x7168, 0x1409, 0x7079, 0, 0, timedia_4079s },

	{ 0x1409, 0x7168, 0x1409, 0x8079, 0, 0, timedia_4079d },

	{ 0x1409, 0x7168, 0x1409, 0x9079, 0, 0, timedia_4079e },

	{ 0x1409, 0x7168, 0x1409, 0xa079, 0, 0, timedia_4079f },

	{ 0x1409, 0x7168, 0x1409, 0xb079, 0, 0, timedia_9079a },

	{ 0x1409, 0x7168, 0x1409, 0xc079, 0, 0, timedia_9079b },

	{ 0x1409, 0x7168, 0x1409, 0xd079, 0, 0, timedia_9079c },



	{ 0, } /* terminate list */

};
@@ -219,6 +286,24 @@ static struct pciserial_board pci_parport_serial_boards[] __devinitdata = { 
		.base_baud	= 115200,

		.uart_offset	= 8,

	},

	[netmos_9900] = { /* n/t */

		.flags		= FL_BASE0 | FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 115200,

		.uart_offset	= 8,

	},

	[netmos_9900_2p] = { /* parallel only */ /* n/t */

		.flags		= FL_BASE0,

		.num_ports	= 0,

		.base_baud	= 115200,

		.uart_offset	= 8,

	},

	[netmos_99xx_1p] = { /* parallel only */ /* n/t */

		.flags		= FL_BASE0,

		.num_ports	= 0,

		.base_baud	= 115200,

		.uart_offset	= 8,

	},

	[avlab_1s1p] = { /* n/t */

		.flags		= FL_BASE0 | FL_BASE_BARS,

		.num_ports	= 1,
@@ -267,6 +352,114 @@ static struct pciserial_board pci_parport_serial_boards[] __devinitdata = { 
		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4078a] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4079h] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4085h] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4088a] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4089a] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4095a] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4096a] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4078u] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4079a] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4085u] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4079r] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4079s] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4079d] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4079e] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_4079f] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_9079a] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_9079b] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

	[timedia_9079c] = {

		.flags		= FL_BASE0|FL_BASE_BARS,

		.num_ports	= 1,

		.base_baud	= 921600,

		.uart_offset	= 8,

	},

};



struct parport_serial_private {
@@ -285,6 +478,10 @@ static int __devinit serial_register (struct pci_dev *dev, 
	struct serial_private *serial;



	board = &pci_parport_serial_boards[id->driver_data];



	if (board->num_ports == 0)

		return 0;



	serial = pciserial_init_ports(dev, board);



	if (IS_ERR(serial))