diff options
author | Jordan Crouse <jordan.crouse@amd.com> | 2005-11-09 17:26:09 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2005-11-09 17:26:09 -0500 |
commit | 7fab773de16ccaeb249acdc6e956a9759c68225d (patch) | |
tree | 4c9b7abc45a3390aff51cc7dbb5e831639aca9e2 | |
parent | 0046b06a367cd853efd3223ce60143f3a7952522 (diff) |
[PATCH] ide: AMD Geode GX/LX support
From: "Jordan Crouse" <jordan.crouse@amd.com>
The core IDE engine on the CS5536 is the same as the other AMD southbridges,
so unlike the CS5535, we can simply add the appropriate PCI headers to
the existing amd74xx code.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | drivers/ide/pci/amd74xx.c | 3 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index 844a6c9fb949..21965e5ef25e 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
@@ -74,6 +74,7 @@ static struct amd_ide_chip { | |||
74 | { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, 0x50, AMD_UDMA_133 }, | 74 | { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, 0x50, AMD_UDMA_133 }, |
75 | { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, 0x50, AMD_UDMA_133 }, | 75 | { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, 0x50, AMD_UDMA_133 }, |
76 | { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE, 0x50, AMD_UDMA_133 }, | 76 | { PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE, 0x50, AMD_UDMA_133 }, |
77 | { PCI_DEVICE_ID_AMD_CS5536_IDE, 0x40, AMD_UDMA_100 }, | ||
77 | { 0 } | 78 | { 0 } |
78 | }; | 79 | }; |
79 | 80 | ||
@@ -491,6 +492,7 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = { | |||
491 | /* 14 */ DECLARE_NV_DEV("NFORCE-MCP04"), | 492 | /* 14 */ DECLARE_NV_DEV("NFORCE-MCP04"), |
492 | /* 15 */ DECLARE_NV_DEV("NFORCE-MCP51"), | 493 | /* 15 */ DECLARE_NV_DEV("NFORCE-MCP51"), |
493 | /* 16 */ DECLARE_NV_DEV("NFORCE-MCP55"), | 494 | /* 16 */ DECLARE_NV_DEV("NFORCE-MCP55"), |
495 | /* 17 */ DECLARE_AMD_DEV("AMD5536"), | ||
494 | }; | 496 | }; |
495 | 497 | ||
496 | static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id) | 498 | static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id) |
@@ -527,6 +529,7 @@ static struct pci_device_id amd74xx_pci_tbl[] = { | |||
527 | { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14 }, | 529 | { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP04_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 14 }, |
528 | { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 }, | 530 | { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP51_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 15 }, |
529 | { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16 }, | 531 | { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 16 }, |
532 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 }, | ||
530 | { 0, }, | 533 | { 0, }, |
531 | }; | 534 | }; |
532 | MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl); | 535 | MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl); |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 9a96f0588393..63dd184ec808 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -487,6 +487,8 @@ | |||
487 | #define PCI_DEVICE_ID_AMD_8151_0 0x7454 | 487 | #define PCI_DEVICE_ID_AMD_8151_0 0x7454 |
488 | #define PCI_DEVICE_ID_AMD_8131_APIC 0x7450 | 488 | #define PCI_DEVICE_ID_AMD_8131_APIC 0x7450 |
489 | 489 | ||
490 | #define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A | ||
491 | |||
490 | #define PCI_VENDOR_ID_TRIDENT 0x1023 | 492 | #define PCI_VENDOR_ID_TRIDENT 0x1023 |
491 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 | 493 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 |
492 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 | 494 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 |