Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-1
+9
-1
drivers/ata/ahci.c
+9
-1
drivers/ata/ahci.c
···
268
268
/* JMicron 360/1/3/5/6, match class to avoid IDE function */
269
269
{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
270
270
PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },
271
+
/* JMicron 362B and 362C have an AHCI function with IDE class code */
272
+
{ PCI_VDEVICE(JMICRON, 0x2362), board_ahci_ign_iferr },
273
+
{ PCI_VDEVICE(JMICRON, 0x236f), board_ahci_ign_iferr },
271
274
272
275
/* ATI */
273
276
{ PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */
···
396
393
.driver_data = board_ahci_yes_fbs }, /* 88se9125 */
397
394
{ PCI_DEVICE(0x1b4b, 0x917a),
398
395
.driver_data = board_ahci_yes_fbs }, /* 88se9172 */
396
+
{ PCI_DEVICE(0x1b4b, 0x9192),
397
+
.driver_data = board_ahci_yes_fbs }, /* 88se9172 on some Gigabyte */
399
398
{ PCI_DEVICE(0x1b4b, 0x91a3),
400
399
.driver_data = board_ahci_yes_fbs },
401
400
···
405
400
{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */
406
401
407
402
/* Asmedia */
408
-
{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1061 */
403
+
{ PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */
404
+
{ PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci }, /* ASM1060 */
405
+
{ PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci }, /* ASM1061 */
406
+
{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1062 */
409
407
410
408
/* Generic, PCI class code for AHCI */
411
409
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,