include/device/pci_ids: move AMD device IDs below AMD vendor ID

Half of the AMD PCI device ID definitions were below the ATI vendor ID,
so move those below the AMD PCI vendor ID definition. The entries are
kept in the order they were before and added before the existing AMD
device ID definitions below the AMD vendor ID definition.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I34ffdc49884737541b8653bebf023a68050375d6
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58582
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 6723b98..0e4da41 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -293,23 +293,6 @@
 #define PCI_DEVICE_ID_ATI_RADEON_RC	0x5146
 #define PCI_DEVICE_ID_ATI_RADEON_RD	0x5147
 
-#define PCI_DEVICE_ID_AMD_10H_NB_HT		0x1200
-#define PCI_DEVICE_ID_AMD_15H_MODEL_000F_NB_HT	0x1600
-#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_15H_MODEL_606F_NB_HT	0x1570
-#define PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_HT	0x15B0
-#define PCI_DEVICE_ID_AMD_16H_MODEL_000F_NB_HT	0x1536
-#define PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_HT	0x1566
-#define PCI_DEVICE_ID_AMD_17H_MODEL_101F_NB	0x15d0
-#define PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB	0x1630
-#define PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_IOMMU	0x1419
-#define PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_IOMMU	0x1423
-#define PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU	0x1577
-#define PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_IOMMU	0x1567
-#define PCI_DEVICE_ID_AMD_17H_MODEL_1020_NB_IOMMU	0x15D1
-#define PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB_IOMMU	0x1631
-
 #define PCI_DEVICE_ID_ATI_SB600_LPC		0x438D
 #define PCI_DEVICE_ID_ATI_SB600_SATA		0x4380
 #define PCI_DEVICE_ID_ATI_SB600_IDE		0x438C
@@ -363,31 +346,6 @@
 #define PCI_DEVICE_ID_ATI_SB800_USB_22_2	0x4396
 #define PCI_DEVICE_ID_ATI_SB800_GEC		0x1699
 
-#define PCI_DEVICE_ID_AMD_SB900_LPC		0x780E
-#define PCI_DEVICE_ID_AMD_SB900_SATA		0x7800
-#define PCI_DEVICE_ID_AMD_SB900_SATA_AHCI	0x7801
-#define PCI_DEVICE_ID_AMD_SB900_SATA_RAID	0x7802
-#define PCI_DEVICE_ID_AMD_SB900_SATA_RAID5	0x7803
-#define PCI_DEVICE_ID_AMD_SB900_SATA_AMDAHCI	0x7804
-#define PCI_DEVICE_ID_AMD_SB900_IDE		0x780C
-#define PCI_DEVICE_ID_AMD_SB900_HDA		0x780D
-#define PCI_DEVICE_ID_AMD_SB900_PCI		0x780F
-#define PCI_DEVICE_ID_AMD_SB900_PCIEA		0x43A0
-#define PCI_DEVICE_ID_AMD_SB900_PCIEB		0x43A1
-#define PCI_DEVICE_ID_AMD_SB900_PCIEC		0x43A2
-#define PCI_DEVICE_ID_AMD_SB900_PCIED		0x43A3
-#define PCI_DEVICE_ID_AMD_SB900_SM		0x780B
-#define PCI_DEVICE_ID_AMD_SB900_USB_16_0	0x7812
-#define PCI_DEVICE_ID_AMD_SB900_USB_16_1	0x7812
-#define PCI_DEVICE_ID_AMD_SB900_USB_18_0	0x7807
-#define PCI_DEVICE_ID_AMD_SB900_USB_18_2	0x7808
-#define PCI_DEVICE_ID_AMD_SB900_USB_19_0	0x7807
-#define PCI_DEVICE_ID_AMD_SB900_USB_19_2	0x7808
-#define PCI_DEVICE_ID_AMD_SB900_USB_20_5	0x7809
-#define PCI_DEVICE_ID_AMD_SB900_GEC		0x7806
-#define PCI_DEVICE_ID_AMD_HUDSON_SD		0x7806
-#define PCI_DEVICE_ID_AMD_YANGTZE_SD		0x7813
-
 #define PCI_DEVICE_ID_ATI_RS690_HT		0x7910
 #define PCI_DEVICE_ID_ATI_RS740_HT		0x7911
 #define PCI_DEVICE_ID_ATI_RS690_PCIE		0x7912
@@ -402,17 +360,6 @@
 #define PCI_DEVICE_ID_ATI_RS690MT_INT_GFX	0x791f
 #define PCI_DEVICE_ID_ATI_RS740_INT_GFX		0x796e
 
-#define PCI_DEVICE_ID_AMD_RS780_HT		0x9600
-#define PCI_DEVICE_ID_AMD_RS780_PCIE		0x9602
-#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV2	0x9603
-#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV3	0x960B
-#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV4	0x9604
-#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV5	0x9605
-#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV6	0x9606
-#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV7	0x9607
-#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV9	0x9608
-#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV10	0x9609
-#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV8	0x960A
 #define PCI_DEVICE_ID_ATI_RS780_INT_GFX		0x9610
 #define PCI_DEVICE_ID_ATI_RS780C_INT_GFX	0x9611
 #define PCI_DEVICE_ID_ATI_RS780M_INT_GFX	0x9612
@@ -424,85 +371,6 @@
 #define PCI_DEVICE_ID_ATI_RS785MC_INT_GFX	0x9713
 #define PCI_DEVICE_ID_ATI_RS785D_INT_GFX	0x9714
 
-#define PCI_DEVICE_ID_AMD_RD890TV_HT		0x5956
-#define PCI_DEVICE_ID_AMD_RX780_HT		0x5957
-#define PCI_DEVICE_ID_AMD_RD780_HT		0x5958
-#define PCI_DEVICE_ID_AMD_SR5690_HT		0x5A10
-#define PCI_DEVICE_ID_AMD_RD890_HT		0x5A11
-#define PCI_DEVICE_ID_AMD_SR5670_HT		0x5A12
-#define PCI_DEVICE_ID_AMD_SR5650_HT		0x5A13
-#define PCI_DEVICE_ID_AMD_990FX_HT		0x5A14
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE		0x5A12
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV2	0x5A16
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV3	0x5A17
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV4	0x5A18
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV5	0x5A19
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV6	0x5A1A
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV7	0x5A1B
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV9	0x5A1C
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV10	0x5A1D
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV11	0x5A1F
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV12	0x5A20
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV13	0x5A1E
-#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV8	0x5A21
-#define PCI_DEVICE_ID_AMD_SR5650_IOMMU		0x5A23
-
-#define PCI_DEVICE_ID_AMD_CZ_HDA	0x157A
-#define PCI_DEVICE_ID_AMD_CZ_LPC	0x790E
-#define PCI_DEVICE_ID_AMD_CZ_SATA	0x7900
-#define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI	0x7901
-#define PCI_DEVICE_ID_AMD_CZ_USB_0	0x7907
-#define PCI_DEVICE_ID_AMD_CZ_USB_1	0x7908
-#define PCI_DEVICE_ID_AMD_CZ_USB3_0	0x7914
-#define PCI_DEVICE_ID_AMD_CZ_SMBUS	0x790B
-
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP		0x15D3
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D1		0x1633
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D2		0x1634
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA		0x15DB
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB		0x15DC
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_BUSABC	0x1635
-#define PCI_DEVICE_ID_AMD_FAM17H_ACP				0x15E2
-#define PCI_DEVICE_ID_AMD_FAM17H_HDA1				0x15E3
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI0			0x15E0
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI1			0x15E1
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL20H_XHCI0			0x15E5
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_XHCI			0x1639
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF0			0x15E8
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1			0x15E9
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2			0x15EA
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3			0x15EB
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4			0x15EC
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5			0x15ED
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF6			0x15EE
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF7			0x15EF
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF0			0x1448
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF1			0x1449
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF2			0x144A
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF3			0x144B
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF4			0x144C
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF5			0x144D
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF6			0x144E
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF7			0x144F
-#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF0			0x166A
-#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF1			0x166B
-#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF2			0x166C
-#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF3			0x166D
-#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF4			0x166E
-#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF5			0x166F
-#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF6			0x1670
-#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF7			0x1671
-#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER0			0x7901
-#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER1			0x7904
-#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER0		0x7916
-#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER1		0x7917
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_SD			0x7906
-#define PCI_DEVICE_ID_AMD_FAM17H_SMBUS				0x790B
-#define PCI_DEVICE_ID_AMD_FAM17H_LPC				0x790E
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_GBE			0x1458
-#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_GBE			0x1641
-#define PCI_DEVICE_ID_AMD_FAM17H_I2S_AC97			0x1644
-
 #define PCI_DEVICE_ID_ATI_FAM17H_MODEL18H_GPU			0x15D8
 #define PCI_DEVICE_ID_ATI_FAM17H_MODEL60H_GPU			0x1636
 #define PCI_DEVICE_ID_ATI_FAM17H_MODEL68H_GPU			0x164C
@@ -624,6 +492,140 @@
 #define PCI_DEVICE_ID_AMI_MEGARAID2	0x9060
 
 #define PCI_VENDOR_ID_AMD		0x1022
+
+#define PCI_DEVICE_ID_AMD_10H_NB_HT		0x1200
+#define PCI_DEVICE_ID_AMD_15H_MODEL_000F_NB_HT	0x1600
+#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_15H_MODEL_606F_NB_HT	0x1570
+#define PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_HT	0x15B0
+#define PCI_DEVICE_ID_AMD_16H_MODEL_000F_NB_HT	0x1536
+#define PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_HT	0x1566
+#define PCI_DEVICE_ID_AMD_17H_MODEL_101F_NB	0x15d0
+#define PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB	0x1630
+#define PCI_DEVICE_ID_AMD_15H_MODEL_101F_NB_IOMMU	0x1419
+#define PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_IOMMU	0x1423
+#define PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU	0x1577
+#define PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_IOMMU	0x1567
+#define PCI_DEVICE_ID_AMD_17H_MODEL_1020_NB_IOMMU	0x15D1
+#define PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB_IOMMU	0x1631
+
+#define PCI_DEVICE_ID_AMD_SB900_LPC		0x780E
+#define PCI_DEVICE_ID_AMD_SB900_SATA		0x7800
+#define PCI_DEVICE_ID_AMD_SB900_SATA_AHCI	0x7801
+#define PCI_DEVICE_ID_AMD_SB900_SATA_RAID	0x7802
+#define PCI_DEVICE_ID_AMD_SB900_SATA_RAID5	0x7803
+#define PCI_DEVICE_ID_AMD_SB900_SATA_AMDAHCI	0x7804
+#define PCI_DEVICE_ID_AMD_SB900_IDE		0x780C
+#define PCI_DEVICE_ID_AMD_SB900_HDA		0x780D
+#define PCI_DEVICE_ID_AMD_SB900_PCI		0x780F
+#define PCI_DEVICE_ID_AMD_SB900_PCIEA		0x43A0
+#define PCI_DEVICE_ID_AMD_SB900_PCIEB		0x43A1
+#define PCI_DEVICE_ID_AMD_SB900_PCIEC		0x43A2
+#define PCI_DEVICE_ID_AMD_SB900_PCIED		0x43A3
+#define PCI_DEVICE_ID_AMD_SB900_SM		0x780B
+#define PCI_DEVICE_ID_AMD_SB900_USB_16_0	0x7812
+#define PCI_DEVICE_ID_AMD_SB900_USB_16_1	0x7812
+#define PCI_DEVICE_ID_AMD_SB900_USB_18_0	0x7807
+#define PCI_DEVICE_ID_AMD_SB900_USB_18_2	0x7808
+#define PCI_DEVICE_ID_AMD_SB900_USB_19_0	0x7807
+#define PCI_DEVICE_ID_AMD_SB900_USB_19_2	0x7808
+#define PCI_DEVICE_ID_AMD_SB900_USB_20_5	0x7809
+#define PCI_DEVICE_ID_AMD_SB900_GEC		0x7806
+#define PCI_DEVICE_ID_AMD_HUDSON_SD		0x7806
+#define PCI_DEVICE_ID_AMD_YANGTZE_SD		0x7813
+
+#define PCI_DEVICE_ID_AMD_RS780_HT		0x9600
+#define PCI_DEVICE_ID_AMD_RS780_PCIE		0x9602
+#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV2	0x9603
+#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV3	0x960B
+#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV4	0x9604
+#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV5	0x9605
+#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV6	0x9606
+#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV7	0x9607
+#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV9	0x9608
+#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV10	0x9609
+#define PCI_DEVICE_ID_AMD_RS780_PCIE_DEV8	0x960A
+
+#define PCI_DEVICE_ID_AMD_RD890TV_HT		0x5956
+#define PCI_DEVICE_ID_AMD_RX780_HT		0x5957
+#define PCI_DEVICE_ID_AMD_RD780_HT		0x5958
+#define PCI_DEVICE_ID_AMD_SR5690_HT		0x5A10
+#define PCI_DEVICE_ID_AMD_RD890_HT		0x5A11
+#define PCI_DEVICE_ID_AMD_SR5670_HT		0x5A12
+#define PCI_DEVICE_ID_AMD_SR5650_HT		0x5A13
+#define PCI_DEVICE_ID_AMD_990FX_HT		0x5A14
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE		0x5A12
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV2	0x5A16
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV3	0x5A17
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV4	0x5A18
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV5	0x5A19
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV6	0x5A1A
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV7	0x5A1B
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV9	0x5A1C
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV10	0x5A1D
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV11	0x5A1F
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV12	0x5A20
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV13	0x5A1E
+#define PCI_DEVICE_ID_AMD_SR5650_PCIE_DEV8	0x5A21
+#define PCI_DEVICE_ID_AMD_SR5650_IOMMU		0x5A23
+
+#define PCI_DEVICE_ID_AMD_CZ_HDA	0x157A
+#define PCI_DEVICE_ID_AMD_CZ_LPC	0x790E
+#define PCI_DEVICE_ID_AMD_CZ_SATA	0x7900
+#define PCI_DEVICE_ID_AMD_CZ_SATA_AHCI	0x7901
+#define PCI_DEVICE_ID_AMD_CZ_USB_0	0x7907
+#define PCI_DEVICE_ID_AMD_CZ_USB_1	0x7908
+#define PCI_DEVICE_ID_AMD_CZ_USB3_0	0x7914
+#define PCI_DEVICE_ID_AMD_CZ_SMBUS	0x790B
+
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP		0x15D3
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D1		0x1633
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D2		0x1634
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA		0x15DB
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB		0x15DC
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_BUSABC	0x1635
+#define PCI_DEVICE_ID_AMD_FAM17H_ACP				0x15E2
+#define PCI_DEVICE_ID_AMD_FAM17H_HDA1				0x15E3
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI0			0x15E0
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_XHCI1			0x15E1
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL20H_XHCI0			0x15E5
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_XHCI			0x1639
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF0			0x15E8
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1			0x15E9
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2			0x15EA
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3			0x15EB
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4			0x15EC
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5			0x15ED
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF6			0x15EE
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF7			0x15EF
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF0			0x1448
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF1			0x1449
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF2			0x144A
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF3			0x144B
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF4			0x144C
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF5			0x144D
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF6			0x144E
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_DF7			0x144F
+#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF0			0x166A
+#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF1			0x166B
+#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF2			0x166C
+#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF3			0x166D
+#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF4			0x166E
+#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF5			0x166F
+#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF6			0x1670
+#define PCI_DEVICE_ID_AMD_FAM19H_MODEL51H_DF7			0x1671
+#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER0			0x7901
+#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER1			0x7904
+#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER0		0x7916
+#define PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER1		0x7917
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_SD			0x7906
+#define PCI_DEVICE_ID_AMD_FAM17H_SMBUS				0x790B
+#define PCI_DEVICE_ID_AMD_FAM17H_LPC				0x790E
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_GBE			0x1458
+#define PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_GBE			0x1641
+#define PCI_DEVICE_ID_AMD_FAM17H_I2S_AC97			0x1644
+
 #define PCI_DEVICE_ID_AMD_LANCE		0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001
 #define PCI_DEVICE_ID_AMD_LX		0x1054