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/pi/hudson/hda.c | 2 +- src/southbridge/amd/pi/hudson/ide.c | 2 +- src/southbridge/amd/pi/hudson/lpc.c | 2 +- src/southbridge/amd/pi/hudson/pci.c | 2 +- src/southbridge/amd/pi/hudson/pcie.c | 8 ++++---- src/southbridge/amd/pi/hudson/sata.c | 4 ++-- src/southbridge/amd/pi/hudson/sm.c | 2 +- src/southbridge/amd/pi/hudson/usb.c | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/southbridge/amd/pi') diff --git a/src/southbridge/amd/pi/hudson/hda.c b/src/southbridge/amd/pi/hudson/hda.c index 752cc2e8b0..79932ee53a 100644 --- a/src/southbridge/amd/pi/hudson/hda.c +++ b/src/southbridge/amd/pi/hudson/hda.c @@ -23,7 +23,7 @@ #include "hudson.h" static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_ATI_SB900_HDA, + PCI_DEVICE_ID_AMD_SB900_HDA, PCI_DEVICE_ID_AMD_CZ_HDA, 0 }; diff --git a/src/southbridge/amd/pi/hudson/ide.c b/src/southbridge/amd/pi/hudson/ide.c index abb61e0253..acafb731c7 100644 --- a/src/southbridge/amd/pi/hudson/ide.c +++ b/src/southbridge/amd/pi/hudson/ide.c @@ -40,5 +40,5 @@ static struct device_operations ide_ops = { static const struct pci_driver ide_driver __pci_driver = { .ops = &ide_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_IDE, + .device = PCI_DEVICE_ID_AMD_SB900_IDE, }; diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c index 9f01020f11..1dacfd0dbd 100644 --- a/src/southbridge/amd/pi/hudson/lpc.c +++ b/src/southbridge/amd/pi/hudson/lpc.c @@ -341,7 +341,7 @@ static struct device_operations lpc_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_ATI_SB900_LPC, + PCI_DEVICE_ID_AMD_SB900_LPC, PCI_DEVICE_ID_AMD_CZ_LPC, 0 }; diff --git a/src/southbridge/amd/pi/hudson/pci.c b/src/southbridge/amd/pi/hudson/pci.c index 836794e4e5..9fcfa2c0d1 100644 --- a/src/southbridge/amd/pi/hudson/pci.c +++ b/src/southbridge/amd/pi/hudson/pci.c @@ -63,5 +63,5 @@ 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, }; diff --git a/src/southbridge/amd/pi/hudson/pcie.c b/src/southbridge/amd/pi/hudson/pcie.c index 5817562da9..8fd3fdd70c 100644 --- a/src/southbridge/amd/pi/hudson/pcie.c +++ b/src/southbridge/amd/pi/hudson/pcie.c @@ -41,21 +41,21 @@ static struct device_operations pci_ops = { static const struct pci_driver pciea_driver __pci_driver = { .ops = &pci_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_PCIEA, + .device = PCI_DEVICE_ID_AMD_SB900_PCIEA, }; static const struct pci_driver pcieb_driver __pci_driver = { .ops = &pci_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_PCIEB, + .device = PCI_DEVICE_ID_AMD_SB900_PCIEB, }; static const struct pci_driver pciec_driver __pci_driver = { .ops = &pci_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_PCIEC, + .device = PCI_DEVICE_ID_AMD_SB900_PCIEC, }; static const struct pci_driver pcied_driver __pci_driver = { .ops = &pci_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_PCIED, + .device = PCI_DEVICE_ID_AMD_SB900_PCIED, }; diff --git a/src/southbridge/amd/pi/hudson/sata.c b/src/southbridge/amd/pi/hudson/sata.c index e71ba5df11..11f0977296 100644 --- a/src/southbridge/amd/pi/hudson/sata.c +++ b/src/southbridge/amd/pi/hudson/sata.c @@ -69,8 +69,8 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_ATI_SB900_SATA, - PCI_DEVICE_ID_ATI_SB900_SATA_AHCI, + PCI_DEVICE_ID_AMD_SB900_SATA, + PCI_DEVICE_ID_AMD_SB900_SATA_AHCI, PCI_DEVICE_ID_AMD_CZ_SATA, PCI_DEVICE_ID_AMD_CZ_SATA_AHCI, 0 diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c index cb511ec54b..74367a75aa 100644 --- a/src/southbridge/amd/pi/hudson/sm.c +++ b/src/southbridge/amd/pi/hudson/sm.c @@ -166,5 +166,5 @@ static struct device_operations smbus_ops = { static const struct pci_driver smbus_driver __pci_driver = { .ops = &smbus_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_ATI_SB900_SM, + .device = PCI_DEVICE_ID_AMD_SB900_SM, }; diff --git a/src/southbridge/amd/pi/hudson/usb.c b/src/southbridge/amd/pi/hudson/usb.c index 9eb35ccb36..0d9102a97a 100644 --- a/src/southbridge/amd/pi/hudson/usb.c +++ b/src/southbridge/amd/pi/hudson/usb.c @@ -40,9 +40,9 @@ static struct device_operations usb_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_ATI_SB900_USB_18_0, - PCI_DEVICE_ID_ATI_SB900_USB_18_2, - PCI_DEVICE_ID_ATI_SB900_USB_20_5, + PCI_DEVICE_ID_AMD_SB900_USB_18_0, + PCI_DEVICE_ID_AMD_SB900_USB_18_2, + PCI_DEVICE_ID_AMD_SB900_USB_20_5, PCI_DEVICE_ID_AMD_CZ_USB_0, PCI_DEVICE_ID_AMD_CZ_USB_1, PCI_DEVICE_ID_AMD_CZ_USB3_0, -- cgit v1.2.3