diff options
-rw-r--r-- | drivers/scsi/sata_promise.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index b4cbc9d6be1b..e35838043b56 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c | |||
@@ -70,6 +70,10 @@ enum { | |||
70 | PDC_HAS_PATA = (1 << 1), /* PDC20375 has PATA */ | 70 | PDC_HAS_PATA = (1 << 1), /* PDC20375 has PATA */ |
71 | 71 | ||
72 | PDC_RESET = (1 << 11), /* HDMA reset */ | 72 | PDC_RESET = (1 << 11), /* HDMA reset */ |
73 | |||
74 | PDC_COMMON_FLAGS = ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST | | ||
75 | ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI | | ||
76 | ATA_FLAG_PIO_POLLING, | ||
73 | }; | 77 | }; |
74 | 78 | ||
75 | 79 | ||
@@ -162,9 +166,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
162 | /* board_2037x */ | 166 | /* board_2037x */ |
163 | { | 167 | { |
164 | .sht = &pdc_ata_sht, | 168 | .sht = &pdc_ata_sht, |
165 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 169 | .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, |
166 | ATA_FLAG_SRST | ATA_FLAG_MMIO | | ||
167 | ATA_FLAG_PIO_POLLING, | ||
168 | .pio_mask = 0x1f, /* pio0-4 */ | 170 | .pio_mask = 0x1f, /* pio0-4 */ |
169 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 171 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
170 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 172 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ |
@@ -174,9 +176,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
174 | /* board_20319 */ | 176 | /* board_20319 */ |
175 | { | 177 | { |
176 | .sht = &pdc_ata_sht, | 178 | .sht = &pdc_ata_sht, |
177 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 179 | .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, |
178 | ATA_FLAG_SRST | ATA_FLAG_MMIO | | ||
179 | ATA_FLAG_PIO_POLLING, | ||
180 | .pio_mask = 0x1f, /* pio0-4 */ | 180 | .pio_mask = 0x1f, /* pio0-4 */ |
181 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 181 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
182 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 182 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ |
@@ -186,9 +186,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
186 | /* board_20619 */ | 186 | /* board_20619 */ |
187 | { | 187 | { |
188 | .sht = &pdc_ata_sht, | 188 | .sht = &pdc_ata_sht, |
189 | .host_flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST | | 189 | .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS, |
190 | ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS | | ||
191 | ATA_FLAG_PIO_POLLING, | ||
192 | .pio_mask = 0x1f, /* pio0-4 */ | 190 | .pio_mask = 0x1f, /* pio0-4 */ |
193 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 191 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
194 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 192 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ |