diff options
Diffstat (limited to 'src/soc/amd/cezanne')
| -rw-r--r-- | src/soc/amd/cezanne/data_fabric.c | 66 | ||||
| -rw-r--r-- | src/soc/amd/cezanne/root_complex.c | 4 |
2 files changed, 35 insertions, 35 deletions
diff --git a/src/soc/amd/cezanne/data_fabric.c b/src/soc/amd/cezanne/data_fabric.c index f62532c3e4..43894e98c8 100644 --- a/src/soc/amd/cezanne/data_fabric.c +++ b/src/soc/amd/cezanne/data_fabric.c @@ -101,29 +101,29 @@ void data_fabric_set_mmio_np(void) static const char *data_fabric_acpi_name(const struct device *dev) { switch (dev->device) { - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF0: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF0: + case PCI_DID_AMD_FAM17H_MODEL60H_DF0: + case PCI_DID_AMD_FAM19H_MODEL51H_DF0: return "DFD0"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF1: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF1: + case PCI_DID_AMD_FAM17H_MODEL60H_DF1: + case PCI_DID_AMD_FAM19H_MODEL51H_DF1: return "DFD1"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF2: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF2: + case PCI_DID_AMD_FAM17H_MODEL60H_DF2: + case PCI_DID_AMD_FAM19H_MODEL51H_DF2: return "DFD2"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF3: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF3: + case PCI_DID_AMD_FAM17H_MODEL60H_DF3: + case PCI_DID_AMD_FAM19H_MODEL51H_DF3: return "DFD3"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF4: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF4: + case PCI_DID_AMD_FAM17H_MODEL60H_DF4: + case PCI_DID_AMD_FAM19H_MODEL51H_DF4: return "DFD4"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF5: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF5: + case PCI_DID_AMD_FAM17H_MODEL60H_DF5: + case PCI_DID_AMD_FAM19H_MODEL51H_DF5: return "DFD5"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF6: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF6: + case PCI_DID_AMD_FAM17H_MODEL60H_DF6: + case PCI_DID_AMD_FAM19H_MODEL51H_DF6: return "DFD6"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF7: - case PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF7: + case PCI_DID_AMD_FAM17H_MODEL60H_DF7: + case PCI_DID_AMD_FAM19H_MODEL51H_DF7: return "DFD7"; default: printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device); @@ -141,28 +141,28 @@ static struct device_operations data_fabric_ops = { static const unsigned short pci_device_ids[] = { /* Renoir DF devices */ - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF0, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF1, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF2, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF3, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF4, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF5, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF6, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF7, + PCI_DID_AMD_FAM17H_MODEL60H_DF0, + PCI_DID_AMD_FAM17H_MODEL60H_DF1, + PCI_DID_AMD_FAM17H_MODEL60H_DF2, + PCI_DID_AMD_FAM17H_MODEL60H_DF3, + PCI_DID_AMD_FAM17H_MODEL60H_DF4, + PCI_DID_AMD_FAM17H_MODEL60H_DF5, + PCI_DID_AMD_FAM17H_MODEL60H_DF6, + PCI_DID_AMD_FAM17H_MODEL60H_DF7, /* Cezanne DF devices */ - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF0, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF1, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF2, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF3, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF4, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF5, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF6, - PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF7, + PCI_DID_AMD_FAM19H_MODEL51H_DF0, + PCI_DID_AMD_FAM19H_MODEL51H_DF1, + PCI_DID_AMD_FAM19H_MODEL51H_DF2, + PCI_DID_AMD_FAM19H_MODEL51H_DF3, + PCI_DID_AMD_FAM19H_MODEL51H_DF4, + PCI_DID_AMD_FAM19H_MODEL51H_DF5, + PCI_DID_AMD_FAM19H_MODEL51H_DF6, + PCI_DID_AMD_FAM19H_MODEL51H_DF7, 0 }; static const struct pci_driver data_fabric_driver __pci_driver = { .ops = &data_fabric_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c index 9cb668e04d..1381df3fd6 100644 --- a/src/soc/amd/cezanne/root_complex.c +++ b/src/soc/amd/cezanne/root_complex.c @@ -225,6 +225,6 @@ static struct device_operations root_complex_operations = { static const struct pci_driver family17_root_complex __pci_driver = { .ops = &root_complex_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_17H_MODEL_606F_NB, }; |