diff options
Diffstat (limited to 'drivers/ide/pci/amd74xx.c')
| -rw-r--r-- | drivers/ide/pci/amd74xx.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index 26263a189448..6f6fadf5a9d8 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
| @@ -261,9 +261,8 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) | |||
| 261 | return; | 261 | return; |
| 262 | 262 | ||
| 263 | hwif->ultra_mask = amd_config->udma_mask; | 263 | hwif->ultra_mask = amd_config->udma_mask; |
| 264 | hwif->mwdma_mask = 0x07; | 264 | if (amd_config->flags & AMD_BAD_SWDMA) |
| 265 | if ((amd_config->flags & AMD_BAD_SWDMA) == 0) | 265 | hwif->swdma_mask = 0x00; |
| 266 | hwif->swdma_mask = 0x07; | ||
| 267 | 266 | ||
| 268 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) { | 267 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) { |
| 269 | if ((amd_80w >> hwif->channel) & 1) | 268 | if ((amd_80w >> hwif->channel) & 1) |
| @@ -284,6 +283,8 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) | |||
| 284 | IDE_HFLAG_POST_SET_MODE | \ | 283 | IDE_HFLAG_POST_SET_MODE | \ |
| 285 | IDE_HFLAG_BOOTABLE, \ | 284 | IDE_HFLAG_BOOTABLE, \ |
| 286 | .pio_mask = ATA_PIO5, \ | 285 | .pio_mask = ATA_PIO5, \ |
| 286 | .swdma_mask = ATA_SWDMA2, \ | ||
| 287 | .mwdma_mask = ATA_MWDMA2, \ | ||
| 287 | } | 288 | } |
| 288 | 289 | ||
| 289 | #define DECLARE_NV_DEV(name_str) \ | 290 | #define DECLARE_NV_DEV(name_str) \ |
| @@ -297,6 +298,8 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) | |||
| 297 | IDE_HFLAG_POST_SET_MODE | \ | 298 | IDE_HFLAG_POST_SET_MODE | \ |
| 298 | IDE_HFLAG_BOOTABLE, \ | 299 | IDE_HFLAG_BOOTABLE, \ |
| 299 | .pio_mask = ATA_PIO5, \ | 300 | .pio_mask = ATA_PIO5, \ |
| 301 | .swdma_mask = ATA_SWDMA2, \ | ||
| 302 | .mwdma_mask = ATA_MWDMA2, \ | ||
| 300 | } | 303 | } |
| 301 | 304 | ||
| 302 | static ide_pci_device_t amd74xx_chipsets[] __devinitdata = { | 305 | static ide_pci_device_t amd74xx_chipsets[] __devinitdata = { |