diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:34:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:34:37 -0500 |
commit | 74a6d0f064cd9106599ce3f1d924309669e83582 (patch) | |
tree | 4d46d554d1235c95c6de37e9b60384580aacd3b3 /drivers/ide/pdc202xx_old.c | |
parent | 14eeee88bfb439a3dc9449f94c23a21930cbe35b (diff) | |
parent | 519d68082e56fe4a5a7d273465323a95cbe5a33f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (33 commits)
ide-cd: remove dead dsc_overlap setting
ide: push local_irq_{save,restore}() to do_identify()
ide: remove superfluous local_irq_{save,restore}() from ide_dump_status()
ide: move legacy ISA/VLB ports handling to ide-legacy.c (v2)
ide: move Power Management support to ide-pm.c
ide: use ATA_DMA_* defines in ide-dma-sff.c
ide: checkpatch.pl fixes for ide-lib.c
ide: remove inline tags from ide-probe.c
ide: remove redundant code from ide_end_drive_cmd()
ide: struct device - replace bus_id with dev_name(), dev_set_name()
ide: rework handling of serialized ports (v2)
cy82c693: remove superfluous ide_cy82c693 chipset type
trm290: add IDE_HFLAG_TRM290 host flag
ide: add ->max_sectors field to struct ide_port_info
rz1000: apply chipset quirks early (v2)
ide: always set nIEN on idle devices
ide: fix ->quirk_list checking in ide_do_request()
gayle: set IDE_HFLAG_SERIALIZE explictly
cmd64x: set IDE_HFLAG_SERIALIZE explictly for CMD646
ali14xx: doesn't use shared IRQs
...
Diffstat (limited to 'drivers/ide/pdc202xx_old.c')
-rw-r--r-- | drivers/ide/pdc202xx_old.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c index 799557c25ee..624e62e5cc9 100644 --- a/drivers/ide/pdc202xx_old.c +++ b/drivers/ide/pdc202xx_old.c | |||
@@ -350,16 +350,17 @@ static const struct ide_dma_ops pdc2026x_dma_ops = { | |||
350 | .dma_timeout = pdc202xx_dma_timeout, | 350 | .dma_timeout = pdc202xx_dma_timeout, |
351 | }; | 351 | }; |
352 | 352 | ||
353 | #define DECLARE_PDC2026X_DEV(udma, extra_flags) \ | 353 | #define DECLARE_PDC2026X_DEV(udma, sectors) \ |
354 | { \ | 354 | { \ |
355 | .name = DRV_NAME, \ | 355 | .name = DRV_NAME, \ |
356 | .init_chipset = init_chipset_pdc202xx, \ | 356 | .init_chipset = init_chipset_pdc202xx, \ |
357 | .port_ops = &pdc2026x_port_ops, \ | 357 | .port_ops = &pdc2026x_port_ops, \ |
358 | .dma_ops = &pdc2026x_dma_ops, \ | 358 | .dma_ops = &pdc2026x_dma_ops, \ |
359 | .host_flags = IDE_HFLAGS_PDC202XX | extra_flags, \ | 359 | .host_flags = IDE_HFLAGS_PDC202XX, \ |
360 | .pio_mask = ATA_PIO4, \ | 360 | .pio_mask = ATA_PIO4, \ |
361 | .mwdma_mask = ATA_MWDMA2, \ | 361 | .mwdma_mask = ATA_MWDMA2, \ |
362 | .udma_mask = udma, \ | 362 | .udma_mask = udma, \ |
363 | .max_sectors = sectors, \ | ||
363 | } | 364 | } |
364 | 365 | ||
365 | static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = { | 366 | static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = { |
@@ -376,8 +377,8 @@ static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = { | |||
376 | 377 | ||
377 | /* 1: PDC2026{2,3} */ | 378 | /* 1: PDC2026{2,3} */ |
378 | DECLARE_PDC2026X_DEV(ATA_UDMA4, 0), | 379 | DECLARE_PDC2026X_DEV(ATA_UDMA4, 0), |
379 | /* 2: PDC2026{5,7} */ | 380 | /* 2: PDC2026{5,7}: UDMA5, limit LBA48 requests to 256 sectors */ |
380 | DECLARE_PDC2026X_DEV(ATA_UDMA5, IDE_HFLAG_RQSIZE_256), | 381 | DECLARE_PDC2026X_DEV(ATA_UDMA5, 256), |
381 | }; | 382 | }; |
382 | 383 | ||
383 | /** | 384 | /** |