aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-09-04 16:25:25 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-27 20:46:29 -0800
commitd87f5a89f5e2d2ce9e3c1b21bd2debe2130cbc90 (patch)
treeecff62e77245897985cbbad237f1a46eb6b69267 /drivers/ata
parentb250e45d7e464c63428170f1b3d2e1e0bd7a6468 (diff)
downloadkernel_samsung_smdk4412-d87f5a89f5e2d2ce9e3c1b21bd2debe2130cbc90.zip
kernel_samsung_smdk4412-d87f5a89f5e2d2ce9e3c1b21bd2debe2130cbc90.tar.gz
kernel_samsung_smdk4412-d87f5a89f5e2d2ce9e3c1b21bd2debe2130cbc90.tar.bz2
ahci: Add identifiers for ASM106x devices
commit 7b4f6ecacb14f384adc1a5a67ad95eb082c02bd1 upstream. They don't always appear as AHCI class devices but instead as IDE class. Based on an initial patch by Hiroaki Nito Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=42804 Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: Abdallah Chatila <abdallah.chatila@ericsson.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/ahci.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 8300250..75a8d0f 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -402,6 +402,12 @@ static const struct pci_device_id ahci_pci_tbl[] = {
/* Promise */
{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */
+ /* Asmedia */
+ { 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,
PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },