diff options
| author | David Teigland <teigland@redhat.com> | 2006-01-18 09:14:51 +0000 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-01-18 09:14:51 +0000 |
| commit | 2ff4782374dde5e3d76daf8a82eae396c0f76567 (patch) | |
| tree | 42cc821174a3f3f410895fce16741948a1103e66 /drivers/scsi/sata_promise.c | |
| parent | cd1344fe322cd9d95b2c0f011d6766677cfcb29b (diff) | |
| parent | 7eb9b2f56c9812d03ac63031869bcc42151067b1 (diff) | |
| download | blackbird-op-linux-2ff4782374dde5e3d76daf8a82eae396c0f76567.tar.gz blackbird-op-linux-2ff4782374dde5e3d76daf8a82eae396c0f76567.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/sata_promise.c')
| -rw-r--r-- | drivers/scsi/sata_promise.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index 3d1ea09a06a1..b0b0a69b3563 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c @@ -66,6 +66,7 @@ enum { board_2037x = 0, /* FastTrak S150 TX2plus */ board_20319 = 1, /* FastTrak S150 TX4 */ board_20619 = 2, /* FastTrak TX4000 */ + board_20771 = 3, /* FastTrak TX2300 */ PDC_HAS_PATA = (1 << 1), /* PDC20375 has PATA */ @@ -190,6 +191,16 @@ static const struct ata_port_info pdc_port_info[] = { .udma_mask = 0x7f, /* udma0-6 ; FIXME */ .port_ops = &pdc_pata_ops, }, + + /* board_20771 */ + { + .sht = &pdc_ata_sht, + .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, + .pio_mask = 0x1f, /* pio0-4 */ + .mwdma_mask = 0x07, /* mwdma0-2 */ + .udma_mask = 0x7f, /* udma0-6 ; FIXME */ + .port_ops = &pdc_sata_ops, + }, }; static const struct pci_device_id pdc_ata_pci_tbl[] = { @@ -226,6 +237,8 @@ static const struct pci_device_id pdc_ata_pci_tbl[] = { { PCI_VENDOR_ID_PROMISE, 0x6629, PCI_ANY_ID, PCI_ANY_ID, 0, 0, board_20619 }, + { PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0, + board_20771 }, { } /* terminate list */ }; @@ -706,6 +719,9 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e case board_2037x: probe_ent->n_ports = 2; break; + case board_20771: + probe_ent->n_ports = 2; + break; case board_20619: probe_ent->n_ports = 4; |
