From patchwork Thu Sep 8 03:43:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keng-Yu Lin X-Patchwork-Id: 1128742 X-Patchwork-Delegate: bhelgaas@google.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p883hsqg023189 for ; Thu, 8 Sep 2011 03:43:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932161Ab1IHDny (ORCPT ); Wed, 7 Sep 2011 23:43:54 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:52735 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932142Ab1IHDnx (ORCPT ); Wed, 7 Sep 2011 23:43:53 -0400 Received: by gya6 with SMTP id 6so306107gya.19 for ; Wed, 07 Sep 2011 20:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer; bh=S5BkAOYC+CPV8olC+R4g0+K44EUFBdv9QOytNHXoL1U=; b=RbbhTeg/cMfvxlycc06p3HBzWx/7jrU0c6Z8nANxyhy0cnWFoyd/fwl7QWYDs77QHJ Ktr7ZphGa8m1GorpVg7FT1EH93iQKoaG5OWIoC+nt6gfCIpAUyugv8AqBDCBhHvbfmhE lNdq3zUl7hGWdZaYNq+GJeMqdC27Df787xtGw= Received: by 10.236.136.65 with SMTP id v41mr1019928yhi.29.1315453432419; Wed, 07 Sep 2011 20:43:52 -0700 (PDT) Received: from localhost (114-32-21-24.HINET-IP.hinet.net [114.32.21.24]) by mx.google.com with ESMTPS id o25sm2206292yhj.24.2011.09.07.20.43.49 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Sep 2011 20:43:51 -0700 (PDT) From: Keng-Yu Lin To: Jeff Garzik , Jesse Barnes , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH] achi, ata_generic: Add ASMedia ASM1061 support Date: Thu, 8 Sep 2011 11:43:46 +0800 Message-Id: <1315453426-8796-1-git-send-email-kengyu@canonical.com> X-Mailer: git-send-email 1.7.5.4 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 08 Sep 2011 03:44:00 +0000 (UTC) ASM1061 PCI-E to SATA bridge controller has two variants. One works under AHCI and the other works with ata_generic. Add the PCI vendor ID and product IDs accordingly. Signed-off-by: Keng-Yu Lin --- drivers/ata/ahci.c | 3 +++ drivers/ata/ata_generic.c | 1 + include/linux/pci_ids.h | 4 ++++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 71afe03..4899aad 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -397,6 +397,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/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index 721d38b..8187503 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c @@ -220,6 +220,7 @@ static struct pci_device_id ata_generic[] = { { PCI_DEVICE(PCI_VENDOR_ID_HINT, PCI_DEVICE_ID_HINT_VXPROII_IDE), }, { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561), }, { PCI_DEVICE(PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558), }, + { PCI_DEVICE(PCI_VENDOR_ID_ASMEDIA,PCI_DEVICE_ID_ASM1061_IDE), }, { PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), .driver_data = ATA_GEN_FORCE_DMA }, /* diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f8910e1..87182b8 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2844,3 +2844,7 @@ #define PCI_VENDOR_ID_XEN 0x5853 #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001 + +#define PCI_VENDOR_ID_ASMEDIA 0x1b21 +#define PCI_DEVICE_ID_ASM1061_IDE 0x0611 +#define PCI_DEVICE_ID_ASM1061_AHCI 0x0612