* [PATCH] serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
@ 2011-05-13 19:49 Antony Pavlov
2011-05-13 21:01 ` Alan Cox
2011-05-13 23:22 ` Greg KH
0 siblings, 2 replies; 6+ messages in thread
From: Antony Pavlov @ 2011-05-13 19:49 UTC (permalink / raw)
To: Greg Kroah-Hartman, Alan Cox, linux-serial; +Cc: Antony Pavlov
This patch adds support for the Omega-PCI, an 8-port asynchronous
multiport adapter for computers with PCI bus [1].
[1] http://www.cronyx.ru/hardware/ompci.html
Signed-off-by: Antony Pavlov <antony@niisi.msk.ru>
---
drivers/tty/serial/8250_pci.c | 31 +++++++++++++++++++++++++++++++
include/linux/pci_ids.h | 1 +
2 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 738cec9..a640e95 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@ -973,6 +973,14 @@ ce4100_serial_setup(struct serial_private *priv,
return ret;
}
+static int
+pci_omegapci_setup(struct serial_private *priv,
+ struct pciserial_board *board,
+ struct uart_port *port, int idx)
+{
+ return setup_port(priv, port, 2, idx * 8, 0);
+}
+
static int skip_tx_en_setup(struct serial_private *priv,
const struct pciserial_board *board,
struct uart_port *port, int idx)
@@ -1296,6 +1304,16 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.exit = __devexit_p(pci_plx9050_exit),
},
/*
+ * Cronyx Omega PCI (PLX-chip based)
+ */
+ {
+ .vendor = PCI_VENDOR_ID_PLX,
+ .device = PCI_DEVICE_ID_PLX_CRONYX_OMEGA,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .setup = pci_omegapci_setup,
+ },
+ /*
* SBS Technologies, Inc., PMC-OCTALPRO 232
*/
{
@@ -1617,6 +1635,7 @@ enum pci_board_num_t {
pbn_ADDIDATA_PCIe_4_3906250,
pbn_ADDIDATA_PCIe_8_3906250,
pbn_ce4100_1_115200,
+ pbn_omegapci,
};
/*
@@ -2312,6 +2331,12 @@ static struct pciserial_board pci_boards[] __devinitdata = {
.base_baud = 921600,
.reg_shift = 2,
},
+ [pbn_omegapci] = {
+ .flags = FL_BASE0,
+ .num_ports = 8,
+ .base_baud = 115200,
+ .uart_offset = 0x200,
+ },
};
static const struct pci_device_id softmodem_blacklist[] = {
@@ -3801,6 +3826,12 @@ static struct pci_device_id serial_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
pbn_ce4100_1_115200 },
+ /*
+ * Cronyx Omega PCI
+ */
+ { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_CRONYX_OMEGA,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ pbn_omegapci },
/*
* These entries match devices with class COMMUNICATION_SERIAL,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 8abe8d7..a237e26 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1028,6 +1028,7 @@
#define PCI_DEVICE_ID_PLX_9056 0x9056
#define PCI_DEVICE_ID_PLX_9080 0x9080
#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2 0xa001
+#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA 0xc001
#define PCI_VENDOR_ID_MADGE 0x10b6
#define PCI_DEVICE_ID_MADGE_MK2 0x0002
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
2011-05-13 19:49 [PATCH] serial: 8250_pci: add support for Cronyx Omega PCI multiserial board Antony Pavlov
@ 2011-05-13 21:01 ` Alan Cox
2011-05-13 23:22 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Alan Cox @ 2011-05-13 21:01 UTC (permalink / raw)
To: Antony Pavlov; +Cc: Greg Kroah-Hartman, linux-serial
On Fri, 13 May 2011 23:49:49 +0400
Antony Pavlov <antony@niisi.msk.ru> wrote:
> This patch adds support for the Omega-PCI, an 8-port asynchronous
> multiport adapter for computers with PCI bus [1].
>
> [1] http://www.cronyx.ru/hardware/ompci.html
>
> Signed-off-by: Antony Pavlov <antony@niisi.msk.ru>
Acked-by: Alan Cox <alan@linux.intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
2011-05-13 19:49 [PATCH] serial: 8250_pci: add support for Cronyx Omega PCI multiserial board Antony Pavlov
2011-05-13 21:01 ` Alan Cox
@ 2011-05-13 23:22 ` Greg KH
1 sibling, 0 replies; 6+ messages in thread
From: Greg KH @ 2011-05-13 23:22 UTC (permalink / raw)
To: Antony Pavlov; +Cc: Greg Kroah-Hartman, Alan Cox, linux-serial
On Fri, May 13, 2011 at 11:49:49PM +0400, Antony Pavlov wrote:
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -1028,6 +1028,7 @@
> #define PCI_DEVICE_ID_PLX_9056 0x9056
> #define PCI_DEVICE_ID_PLX_9080 0x9080
> #define PCI_DEVICE_ID_PLX_GTEK_SERIAL2 0xa001
> +#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA 0xc001
Please don't add new entries to this file, look at the top of it for
why.
Please move this into the driver file itself and resend this.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
@ 2011-05-14 4:39 Antony Pavlov
2011-05-17 18:22 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Antony Pavlov @ 2011-05-14 4:39 UTC (permalink / raw)
To: Greg Kroah-Hartman, Alan Cox, linux-serial; +Cc: Antony Pavlov
This patch adds support for the Omega-PCI, an 8-port asynchronous
multiport adapter for computers with PCI bus [1].
[1] http://www.cronyx.ru/hardware/ompci.html
Signed-off-by: Antony Pavlov <antony@niisi.msk.ru>
---
drivers/tty/serial/8250_pci.c | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 738cec9..b3b8bac 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@ -973,6 +973,14 @@ ce4100_serial_setup(struct serial_private *priv,
return ret;
}
+static int
+pci_omegapci_setup(struct serial_private *priv,
+ struct pciserial_board *board,
+ struct uart_port *port, int idx)
+{
+ return setup_port(priv, port, 2, idx * 8, 0);
+}
+
static int skip_tx_en_setup(struct serial_private *priv,
const struct pciserial_board *board,
struct uart_port *port, int idx)
@@ -1012,6 +1020,7 @@ static int skip_tx_en_setup(struct serial_private *priv,
#define PCI_DEVICE_ID_TITAN_200EI 0xA016
#define PCI_DEVICE_ID_TITAN_200EISI 0xA017
#define PCI_DEVICE_ID_OXSEMI_16PCI958 0x9538
+#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA 0xc001
/* Unknown vendors/cards - this should not be in linux/pci_ids.h */
#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584
@@ -1296,6 +1305,16 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.exit = __devexit_p(pci_plx9050_exit),
},
/*
+ * Cronyx Omega PCI (PLX-chip based)
+ */
+ {
+ .vendor = PCI_VENDOR_ID_PLX,
+ .device = PCI_DEVICE_ID_PLX_CRONYX_OMEGA,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .setup = pci_omegapci_setup,
+ },
+ /*
* SBS Technologies, Inc., PMC-OCTALPRO 232
*/
{
@@ -1617,6 +1636,7 @@ enum pci_board_num_t {
pbn_ADDIDATA_PCIe_4_3906250,
pbn_ADDIDATA_PCIe_8_3906250,
pbn_ce4100_1_115200,
+ pbn_omegapci,
};
/*
@@ -2312,6 +2332,12 @@ static struct pciserial_board pci_boards[] __devinitdata = {
.base_baud = 921600,
.reg_shift = 2,
},
+ [pbn_omegapci] = {
+ .flags = FL_BASE0,
+ .num_ports = 8,
+ .base_baud = 115200,
+ .uart_offset = 0x200,
+ },
};
static const struct pci_device_id softmodem_blacklist[] = {
@@ -3801,6 +3827,12 @@ static struct pci_device_id serial_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
pbn_ce4100_1_115200 },
+ /*
+ * Cronyx Omega PCI
+ */
+ { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_CRONYX_OMEGA,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ pbn_omegapci },
/*
* These entries match devices with class COMMUNICATION_SERIAL,
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
2011-05-14 4:39 Antony Pavlov
@ 2011-05-17 18:22 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2011-05-17 18:22 UTC (permalink / raw)
To: Antony Pavlov; +Cc: Greg Kroah-Hartman, Alan Cox, linux-serial
On Sat, May 14, 2011 at 08:39:32AM +0400, Antony Pavlov wrote:
> This patch adds support for the Omega-PCI, an 8-port asynchronous
> multiport adapter for computers with PCI bus [1].
>
> [1] http://www.cronyx.ru/hardware/ompci.html
>
> Signed-off-by: Antony Pavlov <antony@niisi.msk.ru>
> ---
> drivers/tty/serial/8250_pci.c | 32 ++++++++++++++++++++++++++++++++
What tree did you make this against? It doesn't apply to my tty-next
tree that shows up in the linux-next releases.
Care to refresh it and resend it?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
@ 2011-05-18 18:38 Antony Pavlov
0 siblings, 0 replies; 6+ messages in thread
From: Antony Pavlov @ 2011-05-18 18:38 UTC (permalink / raw)
To: Greg Kroah-Hartman, Alan Cox, linux-serial; +Cc: Antony Pavlov
This patch adds support for the Omega-PCI, an 8-port asynchronous
multiport adapter for computers with PCI bus [1].
[1] http://www.cronyx.ru/hardware/ompci.html
Signed-off-by: Antony Pavlov <antony@niisi.msk.ru>
---
drivers/tty/serial/8250_pci.c | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 762db97..4b4968a 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@ -971,6 +971,14 @@ ce4100_serial_setup(struct serial_private *priv,
return ret;
}
+static int
+pci_omegapci_setup(struct serial_private *priv,
+ struct pciserial_board *board,
+ struct uart_port *port, int idx)
+{
+ return setup_port(priv, port, 2, idx * 8, 0);
+}
+
static int skip_tx_en_setup(struct serial_private *priv,
const struct pciserial_board *board,
struct uart_port *port, int idx)
@@ -1011,6 +1019,7 @@ static int skip_tx_en_setup(struct serial_private *priv,
#define PCI_DEVICE_ID_TITAN_200EISI 0xA017
#define PCI_DEVICE_ID_OXSEMI_16PCI958 0x9538
#define PCIE_DEVICE_ID_NEO_2_OX_IBM 0x00F6
+#define PCI_DEVICE_ID_PLX_CRONYX_OMEGA 0xc001
/* Unknown vendors/cards - this should not be in linux/pci_ids.h */
#define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584
@@ -1438,6 +1447,16 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
.setup = pci_default_setup,
},
/*
+ * Cronyx Omega PCI (PLX-chip based)
+ */
+ {
+ .vendor = PCI_VENDOR_ID_PLX,
+ .device = PCI_DEVICE_ID_PLX_CRONYX_OMEGA,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .setup = pci_omegapci_setup,
+ },
+ /*
* Default "match everything" terminator entry
*/
{
@@ -1624,6 +1643,7 @@ enum pci_board_num_t {
pbn_ADDIDATA_PCIe_4_3906250,
pbn_ADDIDATA_PCIe_8_3906250,
pbn_ce4100_1_115200,
+ pbn_omegapci,
};
/*
@@ -2319,6 +2339,12 @@ static struct pciserial_board pci_boards[] __devinitdata = {
.base_baud = 921600,
.reg_shift = 2,
},
+ [pbn_omegapci] = {
+ .flags = FL_BASE0,
+ .num_ports = 8,
+ .base_baud = 115200,
+ .uart_offset = 0x200,
+ },
};
static const struct pci_device_id softmodem_blacklist[] = {
@@ -3816,6 +3842,12 @@ static struct pci_device_id serial_pci_tbl[] = {
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
pbn_ce4100_1_115200 },
+ /*
+ * Cronyx Omega PCI
+ */
+ { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_CRONYX_OMEGA,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ pbn_omegapci },
/*
* These entries match devices with class COMMUNICATION_SERIAL,
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-05-18 18:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-13 19:49 [PATCH] serial: 8250_pci: add support for Cronyx Omega PCI multiserial board Antony Pavlov
2011-05-13 21:01 ` Alan Cox
2011-05-13 23:22 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2011-05-14 4:39 Antony Pavlov
2011-05-17 18:22 ` Greg KH
2011-05-18 18:38 Antony Pavlov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).