* [PATCH][2.4.31] amd74xx patch for new NVIDIA device IDs
@ 2005-06-23 3:19 Rob Punkunus
2005-06-23 5:43 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Rob Punkunus @ 2005-06-23 3:19 UTC (permalink / raw)
To: rpunkunus, blazara, acurrid, achew, amartin, bzolnier, vojtech,
gregkh, jgarzik
Cc: linux-ide
Signed-off-by: Rob Punkunus <rpunkunus@nvidia.com>
---
diff -pur linux-2.4.31/drivers/ide/pci/amd74xx.c patch-linux-2.4.31/drivers/ide/pci/amd74xx.c
--- linux-2.4.31/drivers/ide/pci/amd74xx.c 2004-11-17 03:54:21.000000000 -0800
+++ patch-linux-2.4.31/drivers/ide/pci/amd74xx.c 2005-06-20 05:43:13.000000000 -0700
@@ -71,6 +71,8 @@ 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 },
+ { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE, 0x50, AMD_UDMA_133 },
{ 0 }
};
@@ -473,6 +475,8 @@ static struct pci_device_id amd74xx_pci_
#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 },
+ { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16 },
{ 0, },
};
diff -pur linux-2.4.31/drivers/ide/pci/amd74xx.h patch-linux-2.4.31/drivers/ide/pci/amd74xx.h
--- linux-2.4.31/drivers/ide/pci/amd74xx.h 2004-11-17 03:54:21.000000000 -0800
+++ patch-linux-2.4.31/drivers/ide/pci/amd74xx.h 2005-06-17 08:19:22.000000000 -0700
@@ -197,6 +197,31 @@ static ide_pci_device_t amd74xx_chipsets
.enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
.bootable = ON_BOARD,
},
+
+ {
+ /* 15 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device = PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE,
+ .name = "NFORCE-MCP51",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
+ {
+ /* 16 */
+ .vendor = PCI_VENDOR_ID_NVIDIA,
+ .device = PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE,
+ .name = "NFORCE-MCP55",
+ .init_chipset = init_chipset_amd74xx,
+ .init_hwif = init_hwif_amd74xx,
+ .channels = 2,
+ .autodma = AUTODMA,
+ .enablebits = {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+ .bootable = ON_BOARD,
+ },
{
.vendor = 0,
.device = 0,
Only in patch-linux-2.4.31/include: asm
Only in patch-linux-2.4.31/include/linux: modules
diff -pur linux-2.4.31/include/linux/pci_ids.h patch-linux-2.4.31/include/linux/pci_ids.h
--- linux-2.4.31/include/linux/pci_ids.h 2005-05-31 17:56:56.000000000 -0700
+++ patch-linux-2.4.31/include/linux/pci_ids.h 2005-06-20 05:49:07.000000000 -0700
@@ -1034,6 +1034,8 @@
#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_1 0x0201
#define PCI_DEVICE_ID_NVIDIA_GEFORCE3_2 0x0202
#define PCI_DEVICE_ID_NVIDIA_QUADRO_DDC 0x0203
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE 0x0265
+#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE 0x036E
#define PCI_VENDOR_ID_IMS 0x10e0
#define PCI_DEVICE_ID_IMS_8849 0x8849
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][2.4.31] amd74xx patch for new NVIDIA device IDs
2005-06-23 3:19 [PATCH][2.4.31] amd74xx patch for new NVIDIA device IDs Rob Punkunus
@ 2005-06-23 5:43 ` Greg KH
2005-06-23 6:05 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Greg KH @ 2005-06-23 5:43 UTC (permalink / raw)
To: Rob Punkunus
Cc: blazara, acurrid, achew, amartin, bzolnier, vojtech, jgarzik,
linux-ide
On Wed, Jun 22, 2005 at 08:19:56PM -0700, Rob Punkunus wrote:
> Signed-off-by: Rob Punkunus <rpunkunus@nvidia.com>
> ---
>
> diff -pur linux-2.4.31/drivers/ide/pci/amd74xx.c patch-linux-2.4.31/drivers/ide/pci/amd74xx.c
> --- linux-2.4.31/drivers/ide/pci/amd74xx.c 2004-11-17 03:54:21.000000000 -0800
Thanks, but I'm not taking any 2.4 patches :)
Good luck,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][2.4.31] amd74xx patch for new NVIDIA device IDs
2005-06-23 5:43 ` Greg KH
@ 2005-06-23 6:05 ` Jeff Garzik
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2005-06-23 6:05 UTC (permalink / raw)
To: Greg KH
Cc: Rob Punkunus, blazara, acurrid, achew, amartin, bzolnier, vojtech,
linux-ide
Greg KH wrote:
> On Wed, Jun 22, 2005 at 08:19:56PM -0700, Rob Punkunus wrote:
>
>>Signed-off-by: Rob Punkunus <rpunkunus@nvidia.com>
>>---
>>
>>diff -pur linux-2.4.31/drivers/ide/pci/amd74xx.c patch-linux-2.4.31/drivers/ide/pci/amd74xx.c
>>--- linux-2.4.31/drivers/ide/pci/amd74xx.c 2004-11-17 03:54:21.000000000 -0800
>
>
> Thanks, but I'm not taking any 2.4 patches :)
If Bart doesn't send it up, I will.
Jeff
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-06-23 6:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-06-23 3:19 [PATCH][2.4.31] amd74xx patch for new NVIDIA device IDs Rob Punkunus
2005-06-23 5:43 ` Greg KH
2005-06-23 6:05 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).