Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c5c8161 authored by Andrew Chew's avatar Andrew Chew Committed by Jeff Garzik
Browse files

[PATCH] sata_nv: Add MCP61 support 



Added MCP61 SATA support to sata_nv.

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 26e27cd4

drivers/ide/pci/amd74xx.c

+5 −2
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ static struct amd_ide_chip { 
	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_AMD_CS5536_IDE,			0x40, AMD_UDMA_100 },

	{ 0 }

};
@@ -488,7 +489,8 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = { 
	/* 14 */ DECLARE_NV_DEV("NFORCE-MCP04"),

	/* 15 */ DECLARE_NV_DEV("NFORCE-MCP51"),

	/* 16 */ DECLARE_NV_DEV("NFORCE-MCP55"),

	/* 17 */ DECLARE_AMD_DEV("AMD5536"),

	/* 17 */ DECLARE_NV_DEV("NFORCE-MCP61"),

	/* 18 */ DECLARE_AMD_DEV("AMD5536"),

};



static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)
@@ -525,7 +527,8 @@ static struct pci_device_id amd74xx_pci_tbl[] = { 
	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16 },

	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE,		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 },

	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE,		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18 },

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);

drivers/scsi/sata_nv.c

+6 −0
Original line number Diff line number Diff line
@@ -140,6 +140,12 @@ static const struct pci_device_id nv_pci_tbl[] = { 
		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3,

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, GENERIC },

	{ PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,

		PCI_ANY_ID, PCI_ANY_ID,

		PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },

include/linux/pci_ids.h

+4 −0
Original line number Diff line number Diff line
@@ -1182,6 +1182,10 @@ 
#define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100         0x034E

#define PCI_DEVICE_ID_NVIDIA_NVENET_14              0x0372

#define PCI_DEVICE_ID_NVIDIA_NVENET_15              0x0373

#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA      0x03E7

#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE       0x03EC

#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2     0x03F6

#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3     0x03F7



#define PCI_VENDOR_ID_IMS		0x10e0

#define PCI_DEVICE_ID_IMS_TT128		0x9128