diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2009-03-31 14:15:28 -0400 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:28 -0400 |
| commit | 74638c84821c066d02c158bc843c84499ddc9764 (patch) | |
| tree | cd6f79f34d87d25a621aaf1369ce226923de3c14 /drivers/ide/sl82c105.c | |
| parent | c4199930b119eb9c1ffb102ed57eaac4d4424d08 (diff) | |
ide: add support for CFA specified transfer modes (take 3)
Add support for the CompactFlash specific PIO modes 5/6 and MWDMA modes 3/4.
Since there were no PIO5 capable hard drives produced and one would also need
66 MHz IDE clock to actually get the difference WRT the address setup timings
programmed, I decided to simply replace the old non-standard PIO mode 5 timings
with the CFA specified ones.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: stf_xl@wp.pl
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/sl82c105.c')
| -rw-r--r-- | drivers/ide/sl82c105.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c index d6f8977191c8..b0a460625335 100644 --- a/drivers/ide/sl82c105.c +++ b/drivers/ide/sl82c105.c | |||
| @@ -61,7 +61,8 @@ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio) | |||
| 61 | if (cmd_off == 0) | 61 | if (cmd_off == 0) |
| 62 | cmd_off = 1; | 62 | cmd_off = 1; |
| 63 | 63 | ||
| 64 | if (pio > 2 || ata_id_has_iordy(drive->id)) | 64 | if ((pio > 2 || ata_id_has_iordy(drive->id)) && |
| 65 | !(pio > 4 && ata_id_is_cfa(drive->id))) | ||
| 65 | iordy = 0x40; | 66 | iordy = 0x40; |
| 66 | 67 | ||
| 67 | return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy; | 68 | return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy; |