summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeng-Yu Lin <kengyu@canonical.com>2011-11-09 01:47:36 -0500
committerJeff Garzik <jgarzik@redhat.com>2011-11-09 01:47:36 -0500
commitc9703765f3d5ab27909011dee4a05affe48e4442 (patch)
treeac105477c2de855106f90a074b628ad8008c4cfe
parent7a46c0780babea7d0b3f277a33ea243be38eb942 (diff)
downloadlinux-stable-c9703765f3d5ab27909011dee4a05affe48e4442.tar.gz
linux-stable-c9703765f3d5ab27909011dee4a05affe48e4442.tar.bz2
linux-stable-c9703765f3d5ab27909011dee4a05affe48e4442.zip
[libata] ahci: Add ASMedia ASM1061 support
Signed-off-by: Keng-Yu Lin <kengyu@canonical.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r--drivers/ata/ahci.c3
-rw-r--r--include/linux/pci_ids.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index fb7b90b05922..cf26222a93c5 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -390,6 +390,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
/* Promise */
{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */
+ /* Asmedia */
+ { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1061 */
+
/* 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 },
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3fdf251389de..172ba70306d1 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2405,6 +2405,8 @@
#define PCI_VENDOR_ID_AZWAVE 0x1a3b
+#define PCI_VENDOR_ID_ASMEDIA 0x1b21
+
#define PCI_VENDOR_ID_TEKRAM 0x1de1
#define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29