Add support to Marvell 6121 in the mv-ahci-pata branch

Add support to Marvell 6121 in the mv-ahci-pata branch

[Jose Alberto Reguero]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

This patch add support to Marvell 6121.

Looking at the code I think that AHCI_FLAG_MV_PATA flag must be assigned to 
the PATA port.

Signed-off-by: Jose Alberto Reguero <jareguero@telefonica.net>

Jose Alberto

[-- Attachment #2: ahci_6121.diff --]
[-- Type: text/x-diff, Size: 804 bytes --]

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 21df81e..8a2a56c 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -528,6 +528,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
 
 	/* Marvell */
 	{ PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },	/* 6145 */
+	{ PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },	/* 6121 */
 
 	/* Generic, PCI class code for AHCI */
 	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -2104,7 +2105,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
 	switch(ent->driver_data) {
 	case board_ahci_mv:
-		mvp_port = 4;		/* count starts from zero */
+		if (pdev->device == 0x6121)
+			mvp_port = 2;		/* count starts from zero */
+		else
+			mvp_port = 4;		/* count starts from zero */
 		break;
 
 	default:

Re: Add support to Marvell 6121 in the mv-ahci-pata branch

[Jeff Garzik]

Jose Alberto Reguero wrote:
> This patch add support to Marvell 6121.
> 
> Looking at the code I think that AHCI_FLAG_MV_PATA flag must be assigned to 
> the PATA port.
> 
> Signed-off-by: Jose Alberto Reguero <jareguero@telefonica.net>

applied, thanks