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

Commit 012b265f authored by Jason Gaston's avatar Jason Gaston Committed by Jeff Garzik
Browse files

[PATCH] Intel ICH8 SATA: add PCI device IDs 



Signed-off-by: default avatarJason Gaston <Jason.d.gaston@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 1bc4ccff

drivers/pci/quirks.c

+4 −1
Original line number Diff line number Diff line
@@ -1142,6 +1142,9 @@ static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev) 
	case 0x27c4:

		ich = 7;

		break;

	case 0x2828:	/* ICH8M */

		ich = 8;

		break;

	default:

		/* we do not handle this PCI device */

		return;
@@ -1161,7 +1164,7 @@ static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev) 
		else

			return;			/* not in combined mode */

	} else {

		WARN_ON((ich != 6) && (ich != 7));

		WARN_ON((ich != 6) && (ich != 7) && (ich != 8));

		tmp &= 0x3;  /* interesting bits 1:0 */

		if (tmp & (1 << 0))

			comb = (1 << 2);	/* PATA port 0, SATA port 1 */

drivers/scsi/ata_piix.c

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },

	{ 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },

	{ 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },

	{ 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },

	{ 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },

	{ 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },



	{ }	/* terminate list */

};