diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-09 17:17:58 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-09 17:17:58 -0400 |
commit | 49521f97ccd3c2bf6e71a91cea8fe65d170fa4fb (patch) | |
tree | f61c34da6092f2f1a97a78da567afc59ad40850b /drivers/ide/ppc/pmac.c | |
parent | 75b1d97535327d0428c6bffd9d5407e65546fd5d (diff) |
ide: add short cables support
This patch allows users to override both host and device side cable detection
with "ideX=ata66" kernel parameter. Thanks to this it should be now possible
to use UDMA > 2 modes on systems (laptops mainly) which use short 40-pin cable
instead of 80-pin one.
Next patches add automatic detection of some systems using short cables.
Changes:
* Rename hwif->udma_four to hwif->cbl and make it u8.
* Convert all existing users accordingly (use ATA_CBL_* defines while at it).
* Add ATA_CBL_PATA40_SHORT support to ide-iops.c:eighty_ninty_three().
* Use ATA_CBL_PATA40_SHORT for "ideX=ata66" kernel parameter.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Reviewed-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 5e3077409457..e46f47206542 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -942,8 +942,8 @@ pmac_ide_tune_chipset (ide_drive_t *drive, byte speed) | |||
942 | return 1; | 942 | return 1; |
943 | case XFER_UDMA_4: | 943 | case XFER_UDMA_4: |
944 | case XFER_UDMA_3: | 944 | case XFER_UDMA_3: |
945 | if (HWIF(drive)->udma_four == 0) | 945 | if (drive->hwif->cbl != ATA_CBL_PATA80) |
946 | return 1; | 946 | return 1; |
947 | case XFER_UDMA_2: | 947 | case XFER_UDMA_2: |
948 | case XFER_UDMA_1: | 948 | case XFER_UDMA_1: |
949 | case XFER_UDMA_0: | 949 | case XFER_UDMA_0: |
@@ -1244,7 +1244,7 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1244 | hwif->chipset = ide_pmac; | 1244 | hwif->chipset = ide_pmac; |
1245 | hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET] || pmif->mediabay; | 1245 | hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET] || pmif->mediabay; |
1246 | hwif->hold = pmif->mediabay; | 1246 | hwif->hold = pmif->mediabay; |
1247 | hwif->udma_four = pmif->cable_80; | 1247 | hwif->cbl = pmif->cable_80 ? ATA_CBL_PATA80 : ATA_CBL_PATA40; |
1248 | hwif->drives[0].unmask = 1; | 1248 | hwif->drives[0].unmask = 1; |
1249 | hwif->drives[1].unmask = 1; | 1249 | hwif->drives[1].unmask = 1; |
1250 | hwif->tuneproc = pmac_ide_tuneproc; | 1250 | hwif->tuneproc = pmac_ide_tuneproc; |