diff options
Diffstat (limited to 'drivers/ata/sata_via.c')
-rw-r--r-- | drivers/ata/sata_via.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index e8b90e7b42dd..a4c0832033d8 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c | |||
@@ -223,7 +223,7 @@ static const struct ata_port_info vt6420_port_info = { | |||
223 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 223 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
224 | .pio_mask = 0x1f, | 224 | .pio_mask = 0x1f, |
225 | .mwdma_mask = 0x07, | 225 | .mwdma_mask = 0x07, |
226 | .udma_mask = 0x7f, | 226 | .udma_mask = ATA_UDMA6, |
227 | .port_ops = &vt6420_sata_ops, | 227 | .port_ops = &vt6420_sata_ops, |
228 | }; | 228 | }; |
229 | 229 | ||
@@ -231,7 +231,7 @@ static struct ata_port_info vt6421_sport_info = { | |||
231 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, | 231 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
232 | .pio_mask = 0x1f, | 232 | .pio_mask = 0x1f, |
233 | .mwdma_mask = 0x07, | 233 | .mwdma_mask = 0x07, |
234 | .udma_mask = 0x7f, | 234 | .udma_mask = ATA_UDMA6, |
235 | .port_ops = &vt6421_sata_ops, | 235 | .port_ops = &vt6421_sata_ops, |
236 | }; | 236 | }; |
237 | 237 | ||
@@ -239,7 +239,7 @@ static struct ata_port_info vt6421_pport_info = { | |||
239 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY, | 239 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY, |
240 | .pio_mask = 0x1f, | 240 | .pio_mask = 0x1f, |
241 | .mwdma_mask = 0, | 241 | .mwdma_mask = 0, |
242 | .udma_mask = 0x7f, | 242 | .udma_mask = ATA_UDMA6, |
243 | .port_ops = &vt6421_pata_ops, | 243 | .port_ops = &vt6421_pata_ops, |
244 | }; | 244 | }; |
245 | 245 | ||
@@ -303,9 +303,7 @@ static int vt6420_prereset(struct ata_port *ap, unsigned long deadline) | |||
303 | if (!(ap->pflags & ATA_PFLAG_LOADING)) | 303 | if (!(ap->pflags & ATA_PFLAG_LOADING)) |
304 | goto skip_scr; | 304 | goto skip_scr; |
305 | 305 | ||
306 | /* Resume phy. This is the old resume sequence from | 306 | /* Resume phy. This is the old SATA resume sequence */ |
307 | * __sata_phy_reset(). | ||
308 | */ | ||
309 | svia_scr_write(ap, SCR_CONTROL, 0x300); | 307 | svia_scr_write(ap, SCR_CONTROL, 0x300); |
310 | svia_scr_read(ap, SCR_CONTROL); /* flush */ | 308 | svia_scr_read(ap, SCR_CONTROL); /* flush */ |
311 | 309 | ||