Commit af00f981 authored by Andy Currid's avatar Andy Currid Committed by Greg Kroah-Hartman
Browse files

[PATCH] PCI: amd74xx patch for new NVIDIA device IDs 



Here's the 2.6 amd74xx patch for NVIDIA MCP51.

Signed-off-by: default avatarAndy Currid <acurrid@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2ac2610b

drivers/ide/pci/amd74xx.c

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static struct amd_ide_chip { 
	{ PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA2,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,	0x50, AMD_UDMA_133 },

	{ 0 }

};
@@ -487,6 +488,7 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = { 
	/* 12 */ DECLARE_NV_DEV("NFORCE3-250-SATA2"),

	/* 13 */ DECLARE_NV_DEV("NFORCE-CK804"),

	/* 14 */ DECLARE_NV_DEV("NFORCE-MCP04"),

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

};



static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)
@@ -521,6 +523,7 @@ static struct pci_device_id amd74xx_pci_tbl[] = { 
#endif

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13 },

	{ 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 },

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);

include/linux/pci_ids.h

+6 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,12 @@ 
#define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL	0x0258

#define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL	0x0259

#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL	0x025B

#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE	0x0265

#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA	0x0266

#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_SATA2	0x0267

#define PCI_DEVICE_ID_NVIDIA_NVENET_12		0x0268

#define PCI_DEVICE_ID_NVIDIA_NVENET_13		0x0269

#define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO	0x026B

#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800	0x0280

#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_8X    0x0281

#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800SE     0x0282