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

Commit 21e2c01d authored by Rob Punkunus's avatar Rob Punkunus Committed by Bartlomiej Zolnierkiewicz
Browse files

[PATCH] amd74xx: support MCP55 device IDs 



From: Rob Punkunus <rpunkunus@nvidia.com>

Rob Punkunus recently submitted a patch to enable support for MCP51/MCP55 in
the amd74xx driver. This patch was whitespace-corrupted and didn't apply to
2.6.12 since MCP51 support was merged in the 2.6.12-rc series.

Gentoo would like to support this hardware for our upcoming release media, so
I fixed the patch, and here it is :)

Signed-off-by: default avatarDaniel Drake <dsd@gentoo.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
parent 13bbbf28

drivers/ide/pci/amd74xx.c

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ static struct amd_ide_chip { 
	{ 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 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,	0x50, AMD_UDMA_133 },

	{ 0 }

};
@@ -489,6 +490,7 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = { 
	/* 13 */ DECLARE_NV_DEV("NFORCE-CK804"),

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

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

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

};



static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)
@@ -524,6 +526,7 @@ static struct pci_device_id amd74xx_pci_tbl[] = { 
	{ 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 },

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

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1238,6 +1238,7 @@ 
#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_NFORCE_MCP55_IDE	0x036E

#define PCI_DEVICE_ID_NVIDIA_NVENET_12		0x0268

#define PCI_DEVICE_ID_NVIDIA_NVENET_13		0x0269

#define PCI_DEVICE_ID_NVIDIA_MCP51_AUDIO	0x026B