Prev: BUG at drivers/scsi/scsi_lib.c:1113
Next: [git pull] drm fixes - some more
From: Alexander Beregalov on 22 Jul 2010 04:20
From: Lytochkin Boris <lytboris(a)gmail.com>

Signed-off-by: Lytochkin Boris <lytboris(a)gmail.com>
Tested-by: Lytochkin Boris <lytboris(a)gmail.com>
Signed-off-by: Alexander Beregalov <a.beregalov(a)gmail.com>
---
drivers/serial/8250_pci.c | 12 ++++++++++++
include/linux/pci_ids.h | 1 +
2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 746a446..0d7a13e 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -1542,6 +1542,8 @@ enum pci_board_num_t {
pbn_b2_4_921600,
pbn_b2_8_921600,

+ pbn_b2_8_1152000,
+
pbn_b2_bt_1_115200,
pbn_b2_bt_2_115200,
pbn_b2_bt_4_115200,
@@ -1960,6 +1962,13 @@ static struct pciserial_board pci_boards[] __devinitdata = {
.uart_offset = 8,
},

+ [pbn_b2_8_1152000] = {
+ .flags = FL_BASE2,
+ .num_ports = 8,
+ .base_baud = 1152000,
+ .uart_offset = 8,
+ },
+
[pbn_b2_bt_1_115200] = {
.flags = FL_BASE2|FL_BASE_BARS,
.num_ports = 1,
@@ -2875,6 +2884,9 @@ static struct pci_device_id serial_pci_tbl[] = {
{ PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952,
PCI_ANY_ID, PCI_ANY_ID, 0, 0,
pbn_b0_bt_2_921600 },
+ { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI958,
+ PCI_ANY_ID , PCI_ANY_ID, 0, 0,
+ pbn_b2_8_1152000 },

/*
* Oxford Semiconductor Inc. Tornado PCI express device range.
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3bedcc1..5bc2a63 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1998,6 +1998,7 @@
#define PCI_DEVICE_ID_OXSEMI_16PCI954PP 0x9513
#define PCI_DEVICE_ID_OXSEMI_16PCI952 0x9521
#define PCI_DEVICE_ID_OXSEMI_16PCI952PP 0x9523
+#define PCI_DEVICE_ID_OXSEMI_16PCI958 0x9538
#define PCI_SUBDEVICE_ID_OXSEMI_C950 0x0001

#define PCI_VENDOR_ID_CHELSIO 0x1425
--
1.7.1.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: BUG at drivers/scsi/scsi_lib.c:1113
Next: [git pull] drm fixes - some more