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

Commit 9ccb1aa1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] pata_ali: Use IGN_SIMPLEX
parents 064e38aa a3cb900c

drivers/ata/pata_ali.c

+11 −6
Original line number Diff line number Diff line
@@ -497,14 +497,16 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	/* Revision 0x20 added DMA */

	static const struct ata_port_info info_20 = {

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48 |

							ATA_FLAG_IGN_SIMPLEX,

		.pio_mask = ATA_PIO4,

		.mwdma_mask = ATA_MWDMA2,

		.port_ops = &ali_20_port_ops

	};

	/* Revision 0x20 with support logic added UDMA */

	static const struct ata_port_info info_20_udma = {

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48 |

							ATA_FLAG_IGN_SIMPLEX,

		.pio_mask = ATA_PIO4,

		.mwdma_mask = ATA_MWDMA2,

		.udma_mask = ATA_UDMA2,
@@ -512,7 +514,8 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	/* Revision 0xC2 adds UDMA66 */

	static const struct ata_port_info info_c2 = {

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48 |

							ATA_FLAG_IGN_SIMPLEX,

		.pio_mask = ATA_PIO4,

		.mwdma_mask = ATA_MWDMA2,

		.udma_mask = ATA_UDMA4,
@@ -520,7 +523,8 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	/* Revision 0xC3 is UDMA66 for now */

	static const struct ata_port_info info_c3 = {

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48 |

							ATA_FLAG_IGN_SIMPLEX,

		.pio_mask = ATA_PIO4,

		.mwdma_mask = ATA_MWDMA2,

		.udma_mask = ATA_UDMA4,
@@ -528,7 +532,8 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	/* Revision 0xC4 is UDMA100 */

	static const struct ata_port_info info_c4 = {

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,

		.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48 |

							ATA_FLAG_IGN_SIMPLEX,

		.pio_mask = ATA_PIO4,

		.mwdma_mask = ATA_MWDMA2,

		.udma_mask = ATA_UDMA5,
@@ -536,7 +541,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	/* Revision 0xC5 is UDMA133 with LBA48 DMA */

	static const struct ata_port_info info_c5 = {

		.flags = ATA_FLAG_SLAVE_POSS,

		.flags = ATA_FLAG_SLAVE_POSS | 	ATA_FLAG_IGN_SIMPLEX,

		.pio_mask = ATA_PIO4,

		.mwdma_mask = ATA_MWDMA2,

		.udma_mask = ATA_UDMA6,