diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 0e4da41921..1ed6ac9eda 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -620,8 +620,6 @@
 #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
diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c
index 496816b0f3..7c466459e6 100644
--- a/src/soc/amd/common/block/lpc/lpc.c
+++ b/src/soc/amd/common/block/lpc/lpc.c
@@ -322,9 +322,10 @@ static struct device_operations lpc_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
+	/* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */
 	PCI_DEVICE_ID_AMD_SB900_LPC,
+	/* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */
 	PCI_DEVICE_ID_AMD_CZ_LPC,
-	PCI_DEVICE_ID_AMD_FAM17H_LPC,
 	0
 };
 static const struct pci_driver lpc_driver __pci_driver = {
diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c
index ce66cbbb7a..ae2edc1506 100644
--- a/src/soc/amd/common/block/smbus/sm.c
+++ b/src/soc/amd/common/block/smbus/sm.c
@@ -89,5 +89,6 @@ static struct device_operations smbus_ops = {
 static const struct pci_driver smbus_driver __pci_driver = {
 	.ops = &smbus_ops,
 	.vendor = PCI_VENDOR_ID_AMD,
+	/* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */
 	.device = PCI_DEVICE_ID_AMD_CZ_SMBUS,
 };
diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index 77d39c5e91..784147c917 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -354,7 +354,9 @@ static struct device_operations lpc_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
+	/* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */
 	PCI_DEVICE_ID_AMD_SB900_LPC,
+	/* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */
 	PCI_DEVICE_ID_AMD_CZ_LPC,
 	0
 };
diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c
index 6f9e03c2d3..f6422cf37e 100644
--- a/src/southbridge/amd/pi/hudson/sm.c
+++ b/src/southbridge/amd/pi/hudson/sm.c
@@ -106,5 +106,6 @@ static struct device_operations smbus_ops = {
 static const struct pci_driver smbus_driver __pci_driver = {
 	.ops = &smbus_ops,
 	.vendor = PCI_VENDOR_ID_AMD,
+	/* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */
 	.device = PCI_DEVICE_ID_AMD_SB900_SM,
 };