From 463f46eb614ee047870a423ce90f78e4516ce012 Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Fri, 14 Oct 2016 20:46:08 -0600 Subject: pci_ids.h: Correct recent AMD ID names Adjust the names to match AMD's convention for family and model. This patch is relevant for: Trinity & Richland: Family 15h Models 00h-0Fh Carrizo: Family 15h Models 60h-6Fh Mullins & Steppe Eagle: Family 16h Models 30h-3Fh Change-Id: I613b84ed438fb70269d789c9901f1928b5500757 Signed-off-by: Marshall Dawson Reviewed-on: https://review.coreboot.org/17169 Reviewed-by: Martin Roth Tested-by: Martin Roth --- src/include/device/pci_ids.h | 6 +++--- src/northbridge/amd/agesa/family15rl/northbridge.c | 2 +- src/northbridge/amd/agesa/family15tn/northbridge.c | 2 +- src/northbridge/amd/pi/00660F01/northbridge.c | 2 +- src/northbridge/amd/pi/00730F01/northbridge.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index cd0a66e6be..94955fc9a2 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -285,11 +285,11 @@ #define PCI_DEVICE_ID_ATI_RADEON_RD 0x5147 #define PCI_DEVICE_ID_AMD_15H_MODEL_000F_NB_HT 0x1600 -#define PCI_DEVICE_ID_AMD_15H_MODEL_001F_NB_HT 0x1400 +#define PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_HT 0x1400 #define PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_HT 0x141A #define PCI_DEVICE_ID_AMD_16H_MODEL_000F_NB_HT 0x1536 -#define PCI_DEVICE_ID_AMD_16H_MODEL_003F_NB_HT 0x1566 -#define PCI_DEVICE_ID_AMD_15H_MODEL_006F_NB_HT 0x1570 +#define PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_HT 0x1566 +#define PCI_DEVICE_ID_AMD_15H_MODEL_606F_NB_HT 0x1570 #define PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_HT 0x15B0 #define PCI_DEVICE_ID_AMD_10H_NB_HT 0x1200 #define PCI_DEVICE_ID_AMD_15H_NB_IOMMU 0x1419 diff --git a/src/northbridge/amd/agesa/family15rl/northbridge.c b/src/northbridge/amd/agesa/family15rl/northbridge.c index 5a208d259e..a8c280757f 100644 --- a/src/northbridge/amd/agesa/family15rl/northbridge.c +++ b/src/northbridge/amd/agesa/family15rl/northbridge.c @@ -590,7 +590,7 @@ static struct device_operations northbridge_operations = { static const struct pci_driver family15_northbridge __pci_driver = { .ops = &northbridge_operations, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_15H_MODEL_001F_NB_HT, + .device = PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_HT, }; static const struct pci_driver family10_northbridge __pci_driver = { diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 4279ba2ead..ae1efb4db7 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -589,7 +589,7 @@ static struct device_operations northbridge_operations = { static const struct pci_driver family15_northbridge __pci_driver = { .ops = &northbridge_operations, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_15H_MODEL_001F_NB_HT, + .device = PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_HT, }; static const struct pci_driver family10_northbridge __pci_driver = { diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c index c44641965a..115d760706 100644 --- a/src/northbridge/amd/pi/00660F01/northbridge.c +++ b/src/northbridge/amd/pi/00660F01/northbridge.c @@ -581,7 +581,7 @@ static struct device_operations northbridge_operations = { static const struct pci_driver family15_northbridge __pci_driver = { .ops = &northbridge_operations, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_15H_MODEL_006F_NB_HT, + .device = PCI_DEVICE_ID_AMD_15H_MODEL_606F_NB_HT, }; static void fam15_finalize(void *chip_info) diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index e8bc425d6a..5b837218ce 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -590,7 +590,7 @@ static struct device_operations northbridge_operations = { static const struct pci_driver family16_northbridge __pci_driver = { .ops = &northbridge_operations, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_16H_MODEL_003F_NB_HT, + .device = PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_HT, }; static const struct pci_driver family10_northbridge __pci_driver = { -- cgit v1.2.3