Merge branch 'upstream'

1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index e35838043b56..02b14a870f52 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 */
 
@@ -115,7 +116,6 @@ static struct scsi_host_template pdc_ata_sht = {
         .dma_boundary           = ATA_DMA_BOUNDARY,
         .slave_configure        = ata_scsi_slave_config,
         .bios_param             = ata_std_bios_param,
-        .ordered_flush          = 1,
 };
 
 static const struct ata_port_operations pdc_sata_ops = {
@@ -192,6 +192,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[] = {
@@ -228,6 +238,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 */
 };
 
@@ -708,6 +720,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;