Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4099d143 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add PIO masks 



* Add ATA_PIO[0-6] defines to <linux/ata.h>.

* Add ->pio_mask field to ide_pci_device_t and ide_hwif_t.

* Add PIO masks to host drivers.

<linux/ata.h> change ACK-ed by Jeff Garzik <jeff@garzik.org>.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 6a824c92

drivers/ide/cris/ide-cris.c

+1 −0
Original line number Diff line number Diff line
@@ -814,6 +814,7 @@ init_e100_ide (void) 
		hwif->dma_host_on = &cris_dma_on;

		hwif->dma_off_quietly = &cris_dma_off;

		hwif->cbl = ATA_CBL_PATA40;

		hwif->pio_mask = ATA_PIO4,

		hwif->ultra_mask = cris_ultra_mask;

		hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */

		hwif->autodma = 1;

drivers/ide/ide.c

+2 −0
Original line number Diff line number Diff line
@@ -457,6 +457,8 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) 


	hwif->host_flags		= tmp_hwif->host_flags;



	hwif->pio_mask			= tmp_hwif->pio_mask;



	hwif->atapi_dma			= tmp_hwif->atapi_dma;

	hwif->ultra_mask		= tmp_hwif->ultra_mask;

	hwif->mwdma_mask		= tmp_hwif->mwdma_mask;

drivers/ide/legacy/ali14xx.c

+2 −0
Original line number Diff line number Diff line
@@ -211,10 +211,12 @@ static int __init ali14xx_probe(void) 
	mate = &ide_hwifs[1];



	hwif->chipset = ide_ali14xx;

	hwif->pio_mask = ATA_PIO4;

	hwif->tuneproc = &ali14xx_tune_drive;

	hwif->mate = mate;



	mate->chipset = ide_ali14xx;

	mate->pio_mask = ATA_PIO4;

	mate->tuneproc = &ali14xx_tune_drive;

	mate->mate = hwif;

	mate->channel = 1;

drivers/ide/legacy/dtc2278.c

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static int __init dtc2278_probe(void) 


	hwif->serialized = 1;

	hwif->chipset = ide_dtc2278;

	hwif->pio_mask = ATA_PIO4;

	hwif->tuneproc = &tune_dtc2278;

	hwif->drives[0].no_unmask = 1;

	hwif->drives[1].no_unmask = 1;

drivers/ide/legacy/ht6560b.c

+2 −0
Original line number Diff line number Diff line
@@ -333,12 +333,14 @@ int __init ht6560b_init(void) 


	hwif->chipset = ide_ht6560b;

	hwif->selectproc = &ht6560b_selectproc;

	hwif->pio_mask = ATA_PIO5;

	hwif->tuneproc = &tune_ht6560b;

	hwif->serialized = 1;	/* is this needed? */

	hwif->mate = mate;



	mate->chipset = ide_ht6560b;

	mate->selectproc = &ht6560b_selectproc;

	mate->pio_mask = ATA_PIO5;

	mate->tuneproc = &tune_ht6560b;

	mate->serialized = 1;	/* is this needed? */

	mate->mate = hwif;