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

Commit 5e88083f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull additional AHCI PCI IDs from Jeff Garzik.

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ahci: Add identifiers for ASM106x devices
  ahci: Add alternate identifier for the 88SE9172
  ahci: Add JMicron 362 device IDs
parents bc01637a 7b4f6eca

drivers/ata/ahci.c

+9 −1
Original line number Diff line number Diff line
@@ -268,6 +268,9 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	/* JMicron 360/1/3/5/6, match class to avoid IDE function */

	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },

	/* JMicron 362B and 362C have an AHCI function with IDE class code */

	{ PCI_VDEVICE(JMICRON, 0x2362), board_ahci_ign_iferr },

	{ PCI_VDEVICE(JMICRON, 0x236f), board_ahci_ign_iferr },



	/* ATI */

	{ PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */
@@ -393,6 +396,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	  .driver_data = board_ahci_yes_fbs },			/* 88se9125 */

	{ PCI_DEVICE(0x1b4b, 0x917a),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 */

	{ PCI_DEVICE(0x1b4b, 0x9192),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 on some Gigabyte */

	{ PCI_DEVICE(0x1b4b, 0x91a3),

	  .driver_data = board_ahci_yes_fbs },
@@ -400,7 +405,10 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },	/* PDC42819 */



	/* Asmedia */

	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },	/* ASM1061 */

	{ PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci },	/* ASM1060 */

	{ PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci },	/* ASM1060 */

	{ PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci },	/* ASM1061 */

	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },	/* ASM1062 */



	/* Generic, PCI class code for AHCI */

	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,