All of lore.kernel.org
 help / color / mirror / Atom feed
From: "V. Ananda Krishnan" <mansarov@linux.vnet.ibm.com>
To: "Kilau, Scott" <Scott.Kilau@digi.com>
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org
Subject: Re: [PATCH] Add new supported board to jsm serial driver.
Date: Mon, 28 Apr 2008 14:00:34 -0500	[thread overview]
Message-ID: <48161ED2.8030306@linux.vnet.ibm.com> (raw)
In-Reply-To: <335DD0B75189FB428E5C32680089FB9F01DF1A49@mtk-sms-mail01.digi.com>

Acked-by: Ananda V <avenkat@us.ibm.com>

Kilau, Scott wrote:
> From: Scott Kilau <scottk@digi.com>
>
> [PATCH] Add new supported board to jsm serial driver.
> Add new PCI Express Neo/JSM board to the supported list of drivers in
> the JSM driver.
>
> Signed-off-by: Scott Kilau <scottk@digi.com>
>
>
> diff -uprN -X /usr/src/kernels/linux-2.6.25.orig/Documentation/dontdiff
> /usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm_driver.c
> /usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm_driver.c
> --- /usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm_driver.c
> 2008-04-16 21:49:44.000000000 -0500
> +++ /usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm_driver.c
> 2008-04-25 11:35:31.000000000 -0500
> @@ -82,7 +82,10 @@ static int jsm_probe_one(struct pci_dev 
>  	/* store the info for the board we've found */
>  	brd->boardnum = adapter_count++;
>  	brd->pci_dev = pdev;
> -	brd->maxports = 2;
> +	if (pdev->device == PCIE_DEVICE_ID_NEO_4_IBM)
> +		brd->maxports = 4;
> +	else
> +		brd->maxports = 2;
>
>  	spin_lock_init(&brd->bd_lock);
>  	spin_lock_init(&brd->bd_intr_lock);
> @@ -208,6 +211,7 @@ static struct pci_device_id jsm_pci_tbl[
>  	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2DB9PRI), 0,
> 0, 1 },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45), 0, 0,
> 2 },
>  	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45PRI), 0,
> 0, 3 },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCIE_DEVICE_ID_NEO_4_IBM), 0,
> 0, 4 },
>  	{ 0, }
>  };
>  MODULE_DEVICE_TABLE(pci, jsm_pci_tbl);
> diff -uprN -X /usr/src/kernels/linux-2.6.25.orig/Documentation/dontdiff
> /usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm.h
> /usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm.h
> --- /usr/src/kernels/linux-2.6.25.orig/drivers/serial/jsm/jsm.h
> 2008-04-16 21:49:44.000000000 -0500
> +++ /usr/src/kernels/linux-2.6.25/drivers/serial/jsm/jsm.h
> 2008-04-25 10:08:04.000000000 -0500
> @@ -373,6 +373,7 @@ struct neo_uart_struct {
>  #define PCI_DEVICE_NEO_2DB9PRI_PCI_NAME		"Neo 2 - DB9
> Universal PCI - Powered Ring Indicator"
>  #define PCI_DEVICE_NEO_2RJ45_PCI_NAME		"Neo 2 - RJ45 Universal
> PCI"
>  #define PCI_DEVICE_NEO_2RJ45PRI_PCI_NAME	"Neo 2 - RJ45 Universal
> PCI - Powered Ring Indicator"
> +#define PCIE_DEVICE_NEO_IBM_PCI_NAME		"Neo 4 - PCI Express -
> IBM"
>
>  /*
>   * Our Global Variables.
> diff -uprN -X /usr/src/kernels/linux-2.6.25.orig/Documentation/dontdiff
> /usr/src/kernels/linux-2.6.25.orig/include/linux/pci_ids.h
> /usr/src/kernels/linux-2.6.25/include/linux/pci_ids.h
> --- /usr/src/kernels/linux-2.6.25.orig/include/linux/pci_ids.h
> 2008-04-16 21:49:44.000000000 -0500
> +++ /usr/src/kernels/linux-2.6.25/include/linux/pci_ids.h
> 2008-04-25 10:10:32.000000000 -0500
> @@ -1429,6 +1429,7 @@
>  #define PCI_DEVICE_ID_NEO_2DB9PRI       0x00C9
>  #define PCI_DEVICE_ID_NEO_2RJ45         0x00CA
>  #define PCI_DEVICE_ID_NEO_2RJ45PRI      0x00CB
> +#define PCIE_DEVICE_ID_NEO_4_IBM        0x00F4
>
>  #define PCI_VENDOR_ID_XIRCOM		0x115d
>  #define PCI_DEVICE_ID_XIRCOM_RBM56G	0x0101
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>
>   


      reply	other threads:[~2008-04-28 19:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-28 15:32 [PATCH] Add new supported board to jsm serial driver Kilau, Scott
2008-04-28 19:00 ` V. Ananda Krishnan [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=48161ED2.8030306@linux.vnet.ibm.com \
    --to=mansarov@linux.vnet.ibm.com \
    --cc=Scott.Kilau@digi.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.