From 9d9a552ac53fb38c3f078ebd02645c5fa1b0959d Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sat, 19 Nov 2016 22:14:59 +0200 Subject: AGESA binaryPI: Fix PCI ID namespace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The defines of device IDs reflects the vendor namespace the ID has been allocated from. Change-Id: Id98f45d5984752a9e8c0484d4cb94e93e55b12f6 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/17510 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Marshall Dawson --- src/southbridge/amd/cimx/sb900/early.c | 2 +- src/southbridge/amd/cimx/sb900/late.c | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/southbridge/amd/cimx') diff --git a/src/southbridge/amd/cimx/sb900/early.c b/src/southbridge/amd/cimx/sb900/early.c index d39de4b272..bee7d74141 100644 --- a/src/southbridge/amd/cimx/sb900/early.c +++ b/src/southbridge/amd/cimx/sb900/early.c @@ -37,7 +37,7 @@ u32 get_sbdn(u32 bus) printk(BIOS_SPEW, "SB900 - Early.c - get_sbdn - Start.\n"); dev = pci_locate_device_on_bus(PCI_ID(PCI_VENDOR_ID_AMD, - PCI_DEVICE_ID_ATI_SB900_SM), bus); + PCI_DEVICE_ID_AMD_SB900_SM), bus); printk(BIOS_SPEW, "SB900 - Early.c - get_sbdn - End.\n"); diff --git a/src/southbridge/amd/cimx/sb900/late.c b/src/southbridge/amd/cimx/sb900/late.c index 65c2446327..90df8e6983 100644 --- a/src/southbridge/amd/cimx/sb900/late.c +++ b/src/southbridge/amd/cimx/sb900/late.c @@ -135,7 +135,7 @@ static struct device_operations lpc_ops = { static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_LPC, + .device = PCI_DEVICE_ID_AMD_SB900_LPC, }; @@ -170,19 +170,19 @@ static const struct pci_driver sata_driver __pci_driver = { .ops = &sata_ops, .vendor = PCI_VENDOR_ID_AMD, #if (CONFIG_SATA_CONTROLLER_MODE == 0x0 || CONFIG_SATA_CONTROLLER_MODE == 0x3) - .device = PCI_DEVICE_ID_ATI_SB900_SATA, //SATA IDE Mode + .device = PCI_DEVICE_ID_AMD_SB900_SATA, //SATA IDE Mode #endif #if (CONFIG_SATA_CONTROLLER_MODE == 0x2 || CONFIG_SATA_CONTROLLER_MODE == 0x4) - .device = PCI_DEVICE_ID_ATI_SB900_SATA_AHCI, //SATA AHCI Mode + .device = PCI_DEVICE_ID_AMD_SB900_SATA_AHCI, //SATA AHCI Mode #endif #if (CONFIG_SATA_CONTROLLER_MODE == 0x5 || CONFIG_SATA_CONTROLLER_MODE == 0x6) - .device = PCI_DEVICE_ID_ATI_SB900_SATA_AMDAHCI, //SATA AMDAHCI Mode + .device = PCI_DEVICE_ID_AMD_SB900_SATA_AMDAHCI, //SATA AMDAHCI Mode #endif #if (CONFIG_SATA_CONTROLLER_MODE == 0x1 && INCHIP_SATA_FORCE_RAID5 == 0x0) - .device = PCI_DEVICE_ID_ATI_SB900_SATA_RAID5, //SATA RAID5 Mode + .device = PCI_DEVICE_ID_AMD_SB900_SATA_RAID5, //SATA RAID5 Mode #endif #if (CONFIG_SATA_CONTROLLER_MODE == 0x1 && INCHIP_SATA_FORCE_RAID5 == 0x1) - .device = PCI_DEVICE_ID_ATI_SB900_SATA_RAID, //SATA RAID Mode + .device = PCI_DEVICE_ID_AMD_SB900_SATA_RAID, //SATA RAID Mode #endif }; @@ -209,25 +209,25 @@ static struct device_operations usb_ops = { static const struct pci_driver usb_xhci123_driver __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_USB_16_0, /* XHCI-USB1, XHCI-USB2 */ + .device = PCI_DEVICE_ID_AMD_SB900_USB_16_0, /* XHCI-USB1, XHCI-USB2 */ }; static const struct pci_driver usb_ohci123_driver __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */ + .device = PCI_DEVICE_ID_AMD_SB900_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */ }; static const struct pci_driver usb_ehci123_driver __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */ + .device = PCI_DEVICE_ID_AMD_SB900_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */ }; static const struct pci_driver usb_ohci4_driver __pci_driver = { .ops = &usb_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_USB_20_5, /* OHCI-USB4 */ + .device = PCI_DEVICE_ID_AMD_SB900_USB_20_5, /* OHCI-USB4 */ }; @@ -250,7 +250,7 @@ static struct device_operations azalia_ops = { static const struct pci_driver azalia_driver __pci_driver = { .ops = &azalia_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_HDA, + .device = PCI_DEVICE_ID_AMD_SB900_HDA, }; @@ -274,7 +274,7 @@ static struct device_operations gec_ops = { static const struct pci_driver gec_driver __pci_driver = { .ops = &gec_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_GEC, + .device = PCI_DEVICE_ID_AMD_SB900_GEC, }; @@ -298,7 +298,7 @@ static struct device_operations pci_ops = { static const struct pci_driver pci_driver __pci_driver = { .ops = &pci_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_PCI, + .device = PCI_DEVICE_ID_AMD_SB900_PCI, }; @@ -317,28 +317,28 @@ struct device_operations bridge_ops = { static const struct pci_driver PORTA_driver __pci_driver = { .ops = &bridge_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_PCIEA, + .device = PCI_DEVICE_ID_AMD_SB900_PCIEA, }; /* 0:15:1 PCIe PortB */ static const struct pci_driver PORTB_driver __pci_driver = { .ops = &bridge_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_PCIEB, + .device = PCI_DEVICE_ID_AMD_SB900_PCIEB, }; /* 0:15:2 PCIe PortC */ static const struct pci_driver PORTC_driver __pci_driver = { .ops = &bridge_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_PCIEC, + .device = PCI_DEVICE_ID_AMD_SB900_PCIEC, }; /* 0:15:3 PCIe PortD */ static const struct pci_driver PORTD_driver __pci_driver = { .ops = &bridge_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_PCIED, + .device = PCI_DEVICE_ID_AMD_SB900_PCIED, }; -- cgit v1.2.3