Add PCI IDs for most Intel southbridges of the 82801 series

(ICH/ICH0 up to the ICH9 family) in preparation for further
code improvements for the i82801xx southbridge code.

Small fixes in the 6300ESB PCI IDs.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2947 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

8 files changed, 363 insertions, 29 deletions

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 73ff5192ad..fd8d6de84f 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -1850,9 +1850,9 @@
 
 /* Intel 82801BA (ICH2) */
 #define PCI_DEVICE_ID_INTEL_82801BA_LPC		0x2440
-#define PCI_DEVICE_ID_INTEL_82801BA_USB_FN2	0x2442
+#define PCI_DEVICE_ID_INTEL_82801BA_USB1	0x2442
 #define PCI_DEVICE_ID_INTEL_82801BA_SMB		0x2443
-#define PCI_DEVICE_ID_INTEL_82801BA_USB_FN4	0x2444
+#define PCI_DEVICE_ID_INTEL_82801BA_USB2	0x2444
 #define PCI_DEVICE_ID_INTEL_82801BA_AC97_AUDIO	0x2445
 #define PCI_DEVICE_ID_INTEL_82801BA_AC97_MODEM	0x2446
 #define PCI_DEVICE_ID_INTEL_82801BA_LAN		0x2449
@@ -1860,9 +1860,9 @@
 #define PCI_DEVICE_ID_INTEL_82801BA_PCI		0x244e
 
 /* Intel 82801BAM (ICH2-M) */
-#define PCI_DEVICE_ID_INTEL_82801BAM_USB_FN2	0x2442
+#define PCI_DEVICE_ID_INTEL_82801BAM_USB1	0x2442
 #define PCI_DEVICE_ID_INTEL_82801BAM_SMB	0x2443
-#define PCI_DEVICE_ID_INTEL_82801BAM_USB_FN4	0x2444
+#define PCI_DEVICE_ID_INTEL_82801BAM_USB2	0x2444
 #define PCI_DEVICE_ID_INTEL_82801BAM_AC97_AUDIO	0x2445
 #define PCI_DEVICE_ID_INTEL_82801BAM_AC97_MODEM	0x2446
 #define PCI_DEVICE_ID_INTEL_82801BAM_PCI	0x2448
@@ -1907,6 +1907,18 @@
 #define PCI_DEVICE_ID_INTEL_82801DB_IDE		0x24cb
 #define PCI_DEVICE_ID_INTEL_82801DB_EHCI	0x24cd
 
+/* Intel 82801DBL (ICH4-L) */
+#define PCI_DEVICE_ID_INTEL_82801DBL_LAN	0x103a
+#define PCI_DEVICE_ID_INTEL_82801DBL_PCI	0x2448
+#define PCI_DEVICE_ID_INTEL_82801DBL_LPC	0x24c0
+#define PCI_DEVICE_ID_INTEL_82801DBL_IDE	0x24c1
+#define PCI_DEVICE_ID_INTEL_82801DBL_USB1	0x24c2
+#define PCI_DEVICE_ID_INTEL_82801DBL_SMB	0x24c3
+#define PCI_DEVICE_ID_INTEL_82801DBL_USB2	0x24c4
+#define PCI_DEVICE_ID_INTEL_82801DBL_AC97_AUDIO	0x24c5
+#define PCI_DEVICE_ID_INTEL_82801DBL_AC97_MODEM	0x24c6
+#define PCI_DEVICE_ID_INTEL_82801DBL_USB3	0x24c7
+
 /* Intel 82801DBM (ICH4-M) */
 #define PCI_DEVICE_ID_INTEL_82801DBM_LAN	0x103a
 #define PCI_DEVICE_ID_INTEL_82801DBM_PCI	0x2448
@@ -1950,6 +1962,325 @@
 #define PCI_DEVICE_ID_INTEL_82801ER_USB4	0x24de
 #define PCI_DEVICE_ID_INTEL_82801ER_SATA	0x24df
 
+/* Intel 82801FB (ICH6) */
+#define PCI_DEVICE_ID_INTEL_82801FB_LAN		0x1065
+#define PCI_DEVICE_ID_INTEL_82801FB_PCI		0x244e
+#define PCI_DEVICE_ID_INTEL_82801FB_LPC		0x2640
+#define PCI_DEVICE_ID_INTEL_82801FB_SATA	0x2651
+#define PCI_DEVICE_ID_INTEL_82801FB_USB1	0x2658
+#define PCI_DEVICE_ID_INTEL_82801FB_USB2	0x2659
+#define PCI_DEVICE_ID_INTEL_82801FB_USB3	0x265a
+#define PCI_DEVICE_ID_INTEL_82801FB_USB4	0x265b
+#define PCI_DEVICE_ID_INTEL_82801FB_EHCI	0x265c
+#define PCI_DEVICE_ID_INTEL_82801FB_PCIE1	0x2660
+#define PCI_DEVICE_ID_INTEL_82801FB_PCIE2	0x2662
+#define PCI_DEVICE_ID_INTEL_82801FB_PCIE3	0x2664
+#define PCI_DEVICE_ID_INTEL_82801FB_PCIE4	0x2666
+#define PCI_DEVICE_ID_INTEL_82801FB_HD_AUDIO	0x2668
+#define PCI_DEVICE_ID_INTEL_82801FB_SMB		0x266a
+#define PCI_DEVICE_ID_INTEL_82801FB_AC97_MODEM	0x266d
+#define PCI_DEVICE_ID_INTEL_82801FB_AC97_AUDIO	0x266e
+#define PCI_DEVICE_ID_INTEL_82801FB_IDE		0x266f
+
+/* Intel 82801FR (ICH6R) */
+#define PCI_DEVICE_ID_INTEL_82801FR_LAN		0x1065
+#define PCI_DEVICE_ID_INTEL_82801FR_PCI		0x244e
+#define PCI_DEVICE_ID_INTEL_82801FR_LPC		0x2640
+#define PCI_DEVICE_ID_INTEL_82801FR_SATA	0x2652
+#define PCI_DEVICE_ID_INTEL_82801FR_USB1	0x2658
+#define PCI_DEVICE_ID_INTEL_82801FR_USB2	0x2659
+#define PCI_DEVICE_ID_INTEL_82801FR_USB3	0x265a
+#define PCI_DEVICE_ID_INTEL_82801FR_USB4	0x265b
+#define PCI_DEVICE_ID_INTEL_82801FR_EHCI	0x265c
+#define PCI_DEVICE_ID_INTEL_82801FR_PCIE1	0x2660
+#define PCI_DEVICE_ID_INTEL_82801FR_PCIE2	0x2662
+#define PCI_DEVICE_ID_INTEL_82801FR_PCIE3	0x2664
+#define PCI_DEVICE_ID_INTEL_82801FR_PCIE4	0x2666
+#define PCI_DEVICE_ID_INTEL_82801FR_HD_AUDIO	0x2668
+#define PCI_DEVICE_ID_INTEL_82801FR_SMB		0x266a
+#define PCI_DEVICE_ID_INTEL_82801FR_AC97_MODEM	0x266d
+#define PCI_DEVICE_ID_INTEL_82801FR_AC97_AUDIO	0x266e
+#define PCI_DEVICE_ID_INTEL_82801FR_IDE		0x266f
+
+/* Intel 82801FW (ICH6W) */
+#define PCI_DEVICE_ID_INTEL_82801FW_LAN		0x1065
+#define PCI_DEVICE_ID_INTEL_82801FW_PCI		0x244e
+#define PCI_DEVICE_ID_INTEL_82801FW_LPC		0x2642
+#define PCI_DEVICE_ID_INTEL_82801FW_SATA	0x2651
+#define PCI_DEVICE_ID_INTEL_82801FW_USB1	0x2658
+#define PCI_DEVICE_ID_INTEL_82801FW_USB2	0x2659
+#define PCI_DEVICE_ID_INTEL_82801FW_USB3	0x265a
+#define PCI_DEVICE_ID_INTEL_82801FW_USB4	0x265b
+#define PCI_DEVICE_ID_INTEL_82801FW_EHCI	0x265c
+#define PCI_DEVICE_ID_INTEL_82801FW_PCIE1	0x2660
+#define PCI_DEVICE_ID_INTEL_82801FW_PCIE2	0x2662
+#define PCI_DEVICE_ID_INTEL_82801FW_PCIE3	0x2664
+#define PCI_DEVICE_ID_INTEL_82801FW_PCIE4	0x2666
+#define PCI_DEVICE_ID_INTEL_82801FW_HD_AUDIO	0x2668
+#define PCI_DEVICE_ID_INTEL_82801FW_SMB		0x266a
+#define PCI_DEVICE_ID_INTEL_82801FW_AC97_MODEM	0x266d
+#define PCI_DEVICE_ID_INTEL_82801FW_AC97_AUDIO	0x266e
+#define PCI_DEVICE_ID_INTEL_82801FW_IDE		0x266f
+
+/* Intel 82801FRW (ICH6RW) */
+#define PCI_DEVICE_ID_INTEL_82801FRW_LAN	0x1065
+#define PCI_DEVICE_ID_INTEL_82801FRW_PCI	0x244e
+#define PCI_DEVICE_ID_INTEL_82801FRW_LPC	0x2642
+#define PCI_DEVICE_ID_INTEL_82801FRW_SATA	0x2652
+#define PCI_DEVICE_ID_INTEL_82801FRW_USB1	0x2658
+#define PCI_DEVICE_ID_INTEL_82801FRW_USB2	0x2659
+#define PCI_DEVICE_ID_INTEL_82801FRW_USB3	0x265a
+#define PCI_DEVICE_ID_INTEL_82801FRW_USB4	0x265b
+#define PCI_DEVICE_ID_INTEL_82801FRW_EHCI	0x265c
+#define PCI_DEVICE_ID_INTEL_82801FRW_PCIE1	0x2660
+#define PCI_DEVICE_ID_INTEL_82801FRW_PCIE2	0x2662
+#define PCI_DEVICE_ID_INTEL_82801FRW_PCIE3	0x2664
+#define PCI_DEVICE_ID_INTEL_82801FRW_PCIE4	0x2666
+#define PCI_DEVICE_ID_INTEL_82801FRW_HD_AUDIO	0x2668
+#define PCI_DEVICE_ID_INTEL_82801FRW_SMB	0x266a
+#define PCI_DEVICE_ID_INTEL_82801FRW_AC97_MODEM	0x266d
+#define PCI_DEVICE_ID_INTEL_82801FRW_AC97_AUDIO	0x266e
+#define PCI_DEVICE_ID_INTEL_82801FRW_IDE	0x266f
+
+/* Intel 82801FBM (ICH6-M) */
+#define PCI_DEVICE_ID_INTEL_82801FBM_LAN	0x1065
+#define PCI_DEVICE_ID_INTEL_82801FBM_PCI	0x2448
+#define PCI_DEVICE_ID_INTEL_82801FBM_LPC	0x2641
+#define PCI_DEVICE_ID_INTEL_82801FBM_SATA	0x2653
+#define PCI_DEVICE_ID_INTEL_82801FBM_USB1	0x2658
+#define PCI_DEVICE_ID_INTEL_82801FBM_USB2	0x2659
+#define PCI_DEVICE_ID_INTEL_82801FBM_USB3	0x265a
+#define PCI_DEVICE_ID_INTEL_82801FBM_USB4	0x265b
+#define PCI_DEVICE_ID_INTEL_82801FBM_EHCI	0x265c
+#define PCI_DEVICE_ID_INTEL_82801FBM_PCIE1	0x2660
+#define PCI_DEVICE_ID_INTEL_82801FBM_PCIE2	0x2662
+#define PCI_DEVICE_ID_INTEL_82801FBM_PCIE3	0x2664
+#define PCI_DEVICE_ID_INTEL_82801FBM_PCIE4	0x2666
+#define PCI_DEVICE_ID_INTEL_82801FBM_HD_AUDIO	0x2668
+#define PCI_DEVICE_ID_INTEL_82801FBM_SMB	0x266a
+#define PCI_DEVICE_ID_INTEL_82801FBM_AC97_MODEM	0x266d
+#define PCI_DEVICE_ID_INTEL_82801FBM_AC97_AUDIO	0x266e
+#define PCI_DEVICE_ID_INTEL_82801FBM_IDE	0x266f
+
+/* Intel 82801GB (ICH7) */
+#define PCI_DEVICE_ID_INTEL_82801GB_LAN		0x27dc
+#define PCI_DEVICE_ID_INTEL_82801GB_PCI		0x244e
+#define PCI_DEVICE_ID_INTEL_82801GB_LPC		0x27b8
+#define PCI_DEVICE_ID_INTEL_82801GB_SATA	0x27c0
+#define PCI_DEVICE_ID_INTEL_82801GB_SATA_AHCI	0x27c1
+#define PCI_DEVICE_ID_INTEL_82801GB_SATA_RAID	0x27c3
+#define PCI_DEVICE_ID_INTEL_82801GB_USB1	0x27c8
+#define PCI_DEVICE_ID_INTEL_82801GB_USB2	0x27c9
+#define PCI_DEVICE_ID_INTEL_82801GB_USB3	0x27ca
+#define PCI_DEVICE_ID_INTEL_82801GB_USB4	0x27cb
+#define PCI_DEVICE_ID_INTEL_82801GB_EHCI	0x27cc
+#define PCI_DEVICE_ID_INTEL_82801GB_PCIE1	0x27d0
+#define PCI_DEVICE_ID_INTEL_82801GB_PCIE2	0x27d2
+#define PCI_DEVICE_ID_INTEL_82801GB_PCIE3	0x27d4
+#define PCI_DEVICE_ID_INTEL_82801GB_PCIE4	0x27d6
+#define PCI_DEVICE_ID_INTEL_82801GB_HD_AUDIO	0x27d8
+#define PCI_DEVICE_ID_INTEL_82801GB_SMB		0x27da
+#define PCI_DEVICE_ID_INTEL_82801GB_AC97_MODEM	0x27de
+#define PCI_DEVICE_ID_INTEL_82801GB_AC97_AUDIO	0x27dd
+#define PCI_DEVICE_ID_INTEL_82801GB_IDE		0x27df
+
+/* Intel 82801GR (ICH7R) */
+#define PCI_DEVICE_ID_INTEL_82801GR_LAN		0x27dc
+#define PCI_DEVICE_ID_INTEL_82801GR_PCI		0x244e
+#define PCI_DEVICE_ID_INTEL_82801GR_LPC		0x27b8
+#define PCI_DEVICE_ID_INTEL_82801GR_SATA	0x27c0
+#define PCI_DEVICE_ID_INTEL_82801GR_SATA_AHCI	0x27c1
+#define PCI_DEVICE_ID_INTEL_82801GR_SATA_RAID	0x27c3
+#define PCI_DEVICE_ID_INTEL_82801GR_USB1	0x27c8
+#define PCI_DEVICE_ID_INTEL_82801GR_USB2	0x27c9
+#define PCI_DEVICE_ID_INTEL_82801GR_USB3	0x27ca
+#define PCI_DEVICE_ID_INTEL_82801GR_USB4	0x27cb
+#define PCI_DEVICE_ID_INTEL_82801GR_EHCI	0x27cc
+#define PCI_DEVICE_ID_INTEL_82801GR_PCIE1	0x27d0
+#define PCI_DEVICE_ID_INTEL_82801GR_PCIE2	0x27d2
+#define PCI_DEVICE_ID_INTEL_82801GR_PCIE3	0x27d4
+#define PCI_DEVICE_ID_INTEL_82801GR_PCIE4	0x27d6
+#define PCI_DEVICE_ID_INTEL_82801GR_PCIE5	0x27e0
+#define PCI_DEVICE_ID_INTEL_82801GR_PCIE6	0x27e2
+#define PCI_DEVICE_ID_INTEL_82801GR_HD_AUDIO	0x27d8
+#define PCI_DEVICE_ID_INTEL_82801GR_SMB		0x27da
+#define PCI_DEVICE_ID_INTEL_82801GR_AC97_MODEM	0x27de
+#define PCI_DEVICE_ID_INTEL_82801GR_AC97_AUDIO	0x27dd
+#define PCI_DEVICE_ID_INTEL_82801GR_IDE		0x27df
+
+/* Intel 82801GDH (ICH7DH) */
+#define PCI_DEVICE_ID_INTEL_82801GDH_LAN	0x27dc
+#define PCI_DEVICE_ID_INTEL_82801GDH_PCI	0x244e
+#define PCI_DEVICE_ID_INTEL_82801GDH_LPC	0x27b8
+#define PCI_DEVICE_ID_INTEL_82801GDH_SATA	0x27c0
+#define PCI_DEVICE_ID_INTEL_82801GDH_SATA_AHCI	0x27c1
+#define PCI_DEVICE_ID_INTEL_82801GDH_SATA_RAID	0x27c3
+#define PCI_DEVICE_ID_INTEL_82801GDH_USB1	0x27c8
+#define PCI_DEVICE_ID_INTEL_82801GDH_USB2	0x27c9
+#define PCI_DEVICE_ID_INTEL_82801GDH_USB3	0x27ca
+#define PCI_DEVICE_ID_INTEL_82801GDH_USB4	0x27cb
+#define PCI_DEVICE_ID_INTEL_82801GDH_EHCI	0x27cc
+#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE1	0x27d0
+#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE2	0x27d2
+#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE3	0x27d4
+#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE4	0x27d6
+#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE5	0x27e0
+#define PCI_DEVICE_ID_INTEL_82801GDH_PCIE6	0x27e2
+#define PCI_DEVICE_ID_INTEL_82801GDH_HD_AUDIO	0x27d8
+#define PCI_DEVICE_ID_INTEL_82801GDH_SMB	0x27da
+#define PCI_DEVICE_ID_INTEL_82801GDH_AC97_MODEM	0x27de
+#define PCI_DEVICE_ID_INTEL_82801GDH_AC97_AUDIO	0x27dd
+#define PCI_DEVICE_ID_INTEL_82801GDH_IDE	0x27df
+
+/* Intel 82801GBM (ICH7-M) */
+#define PCI_DEVICE_ID_INTEL_82801GBM_LAN	0x27dc
+#define PCI_DEVICE_ID_INTEL_82801GBM_PCI	0x2448
+#define PCI_DEVICE_ID_INTEL_82801GBM_LPC	0x27b9
+#define PCI_DEVICE_ID_INTEL_82801GBM_SATA	0x27c4
+#define PCI_DEVICE_ID_INTEL_82801GBM_SATA_AHCI	0x27c5
+#define PCI_DEVICE_ID_INTEL_82801GBM_USB1	0x27c8
+#define PCI_DEVICE_ID_INTEL_82801GBM_USB2	0x27c9
+#define PCI_DEVICE_ID_INTEL_82801GBM_USB3	0x27ca
+#define PCI_DEVICE_ID_INTEL_82801GBM_USB4	0x27cb
+#define PCI_DEVICE_ID_INTEL_82801GBM_EHCI	0x27cc
+#define PCI_DEVICE_ID_INTEL_82801GBM_PCIE1	0x27d0
+#define PCI_DEVICE_ID_INTEL_82801GBM_PCIE2	0x27d2
+#define PCI_DEVICE_ID_INTEL_82801GBM_PCIE3	0x27d4
+#define PCI_DEVICE_ID_INTEL_82801GBM_PCIE4	0x27d6
+#define PCI_DEVICE_ID_INTEL_82801GBM_HD_AUDIO	0x27d8
+#define PCI_DEVICE_ID_INTEL_82801GBM_SMB	0x27da
+#define PCI_DEVICE_ID_INTEL_82801GBM_AC97_MODEM	0x27de
+#define PCI_DEVICE_ID_INTEL_82801GBM_AC97_AUDIO	0x27dd
+#define PCI_DEVICE_ID_INTEL_82801GBM_IDE	0x27df
+
+/* Intel 82801GHM (ICH7-M DH) */
+#define PCI_DEVICE_ID_INTEL_82801GHM_LAN	0x27dc
+#define PCI_DEVICE_ID_INTEL_82801GHM_PCI	0x2448
+#define PCI_DEVICE_ID_INTEL_82801GHM_LPC	0x27bd
+#define PCI_DEVICE_ID_INTEL_82801GHM_SATA	0x27c4
+#define PCI_DEVICE_ID_INTEL_82801GHM_SATA_AHCI	0x27c5
+#define PCI_DEVICE_ID_INTEL_82801GHM_SATA_RAID	0x27c6
+#define PCI_DEVICE_ID_INTEL_82801GHM_USB1	0x27c8
+#define PCI_DEVICE_ID_INTEL_82801GHM_USB2	0x27c9
+#define PCI_DEVICE_ID_INTEL_82801GHM_USB3	0x27ca
+#define PCI_DEVICE_ID_INTEL_82801GHM_USB4	0x27cb
+#define PCI_DEVICE_ID_INTEL_82801GHM_EHCI	0x27cc
+#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE1	0x27d0
+#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE2	0x27d2
+#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE3	0x27d4
+#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE4	0x27d6
+#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE5	0x27e0
+#define PCI_DEVICE_ID_INTEL_82801GHM_PCIE6	0x27e2
+#define PCI_DEVICE_ID_INTEL_82801GHM_HD_AUDIO	0x27d8
+#define PCI_DEVICE_ID_INTEL_82801GHM_SMB	0x27da
+#define PCI_DEVICE_ID_INTEL_82801GHM_AC97_MODEM	0x27de
+#define PCI_DEVICE_ID_INTEL_82801GHM_AC97_AUDIO	0x27dd
+#define PCI_DEVICE_ID_INTEL_82801GHM_IDE	0x27df
+
+/* Intel 82801GU (ICH7-U) */
+#define PCI_DEVICE_ID_INTEL_82801GU_PCI		0x2448
+#define PCI_DEVICE_ID_INTEL_82801GU_LPC		0x27b9
+#define PCI_DEVICE_ID_INTEL_82801GU_USB1	0x27c8
+#define PCI_DEVICE_ID_INTEL_82801GU_USB2	0x27c9
+#define PCI_DEVICE_ID_INTEL_82801GU_USB3	0x27ca
+#define PCI_DEVICE_ID_INTEL_82801GU_USB4	0x27cb
+#define PCI_DEVICE_ID_INTEL_82801GU_EHCI	0x27cc
+#define PCI_DEVICE_ID_INTEL_82801GU_HD_AUDIO	0x27d8
+#define PCI_DEVICE_ID_INTEL_82801GU_SMB		0x27da
+#define PCI_DEVICE_ID_INTEL_82801GU_IDE		0x27df
+
+/* Intel 82801HB (ICH8) */
+#define PCI_DEVICE_ID_INTEL_82801HB_LAN		0x104b
+#define PCI_DEVICE_ID_INTEL_82801HB_LPC		0x2810
+#define PCI_DEVICE_ID_INTEL_82801HB_SATA1	0x2820
+#define PCI_DEVICE_ID_INTEL_82801HB_SATA_AHCI_6	0x2821 /* 6 ports */
+#define PCI_DEVICE_ID_INTEL_82801HB_SATA_RAID	0x2822
+#define PCI_DEVICE_ID_INTEL_82801HB_SATA_AHCI_4	0x2824 /* 4 ports */
+#define PCI_DEVICE_ID_INTEL_82801HB_SATA2	0x2825
+#define PCI_DEVICE_ID_INTEL_82801HB_SMB		0x283e
+#define PCI_DEVICE_ID_INTEL_82801HB_THERMAL	0x284f
+#define PCI_DEVICE_ID_INTEL_82801HB_PCI		0x244e
+#define PCI_DEVICE_ID_INTEL_82801HB_USB1	0x2830
+#define PCI_DEVICE_ID_INTEL_82801HB_USB2	0x2831
+#define PCI_DEVICE_ID_INTEL_82801HB_USB3	0x2832
+#define PCI_DEVICE_ID_INTEL_82801HB_EHCI1	0x2836
+#define PCI_DEVICE_ID_INTEL_82801HB_USB4	0x2834
+#define PCI_DEVICE_ID_INTEL_82801HB_USB5	0x2835
+#define PCI_DEVICE_ID_INTEL_82801HB_EHCI2	0x283a
+#define PCI_DEVICE_ID_INTEL_82801HB_PCIE1	0x283f
+#define PCI_DEVICE_ID_INTEL_82801HB_PCIE2	0x2841
+#define PCI_DEVICE_ID_INTEL_82801HB_PCIE3	0x2843
+#define PCI_DEVICE_ID_INTEL_82801HB_PCIE4	0x2845
+#define PCI_DEVICE_ID_INTEL_82801HB_PCIE5	0x2847
+#define PCI_DEVICE_ID_INTEL_82801HB_PCIE6	0x2849
+#define PCI_DEVICE_ID_INTEL_82801HB_HD_AUDIO	0x284b
+
+/* Intel 82801HR/HH/HO (ICH8R/ICH8DH/ICH8DO), only difference to ICH8: LPC */
+#define PCI_DEVICE_ID_INTEL_82801HR_LPC		0x2810
+#define PCI_DEVICE_ID_INTEL_82801HH_LPC		0x2812
+#define PCI_DEVICE_ID_INTEL_82801HO_LPC		0x2814
+
+/* Intel 82801HBM/HEM (ICH8M/ICH8M-E) */
+#define PCI_DEVICE_ID_INTEL_82801HBM_LAN	0x104b
+#define PCI_DEVICE_ID_INTEL_82801HBM_LPC	0x2815
+#define PCI_DEVICE_ID_INTEL_82801HBM_SATA	0x2828
+#define PCI_DEVICE_ID_INTEL_82801HBM_SATA_AHCI	0x2829
+#define PCI_DEVICE_ID_INTEL_82801HBM_SATA_RAID	0x282a
+#define PCI_DEVICE_ID_INTEL_82801HBM_SMB	0x283e
+#define PCI_DEVICE_ID_INTEL_82801HBM_THERMAL	0x284f
+#define PCI_DEVICE_ID_INTEL_82801HBM_PCI	0x2448
+#define PCI_DEVICE_ID_INTEL_82801HBM_IDE	0x2850 /* TODO: Also ICH8M-E? */
+#define PCI_DEVICE_ID_INTEL_82801HBM_USB1	0x2830
+#define PCI_DEVICE_ID_INTEL_82801HBM_USB2	0x2831
+#define PCI_DEVICE_ID_INTEL_82801HBM_USB3	0x2832
+#define PCI_DEVICE_ID_INTEL_82801HBM_EHCI1	0x2836
+#define PCI_DEVICE_ID_INTEL_82801HBM_USB4	0x2834
+#define PCI_DEVICE_ID_INTEL_82801HBM_USB5	0x2835
+#define PCI_DEVICE_ID_INTEL_82801HBM_EHCI2	0x283a
+#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE1	0x283f
+#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE2	0x2841
+#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE3	0x2843
+#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE4	0x2845
+#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE5	0x2847
+#define PCI_DEVICE_ID_INTEL_82801HBM_PCIE6	0x2849
+#define PCI_DEVICE_ID_INTEL_82801HBM_HD_AUDIO	0x284b
+
+/* Intel 82801HEM (ICH8M-E), only difference to ICH8M: LPC */
+#define PCI_DEVICE_ID_INTEL_82801HEM_LPC	0x2811
+
+/* Intel 82801IB (ICH9) */
+#define PCI_DEVICE_ID_INTEL_82801IB_LPC		0x2918
+#define PCI_DEVICE_ID_INTEL_82801IB_SATA_P0123	0x2920 /* Ports 0 - 3 */
+#define PCI_DEVICE_ID_INTEL_82801IB_SATA_P01	0x2921 /* Ports 0 - 1 */
+#define PCI_DEVICE_ID_INTEL_82801IB_SATA_AHCI1	0x2922 /* Ports 0 - 5 */
+#define PCI_DEVICE_ID_INTEL_82801IB_SATA_AHCI2	0x2923 /* Ports 0, 1, 4, 5 */
+#define PCI_DEVICE_ID_INTEL_82801IB_SATA_RAID	0x2822 /* RAID */
+#define PCI_DEVICE_ID_INTEL_82801IB_SATA_P45	0x2926 /* Ports 4 - 5 */
+#define PCI_DEVICE_ID_INTEL_82801IB_SMB		0x2930
+#define PCI_DEVICE_ID_INTEL_82801IB_THERMAL	0x2932
+#define PCI_DEVICE_ID_INTEL_82801IB_PCI		0x244e /* DMI to PCI bridge */
+#define PCI_DEVICE_ID_INTEL_82801IB_USB1	0x2934
+#define PCI_DEVICE_ID_INTEL_82801IB_USB2	0x2935
+#define PCI_DEVICE_ID_INTEL_82801IB_USB3	0x2936
+#define PCI_DEVICE_ID_INTEL_82801IB_EHCI1	0x293a
+#define PCI_DEVICE_ID_INTEL_82801IB_USB4	0x2937
+#define PCI_DEVICE_ID_INTEL_82801IB_USB5	0x2938
+#define PCI_DEVICE_ID_INTEL_82801IB_USB6	0x2939
+#define PCI_DEVICE_ID_INTEL_82801IB_EHCI2	0x293c
+#define PCI_DEVICE_ID_INTEL_82801IB_HD_AUDIO	0x293e
+#define PCI_DEVICE_ID_INTEL_82801IB_PCIE1	0x2940
+#define PCI_DEVICE_ID_INTEL_82801IB_PCIE2	0x2942
+#define PCI_DEVICE_ID_INTEL_82801IB_PCIE3	0x2944
+#define PCI_DEVICE_ID_INTEL_82801IB_PCIE4	0x2946
+#define PCI_DEVICE_ID_INTEL_82801IB_PCIE5	0x2948
+#define PCI_DEVICE_ID_INTEL_82801IB_PCIE6	0x294a
+#define PCI_DEVICE_ID_INTEL_82801IB_LAN		0x29c4
+
+/* Intel 82801IR/IH/IO (ICH9R/ICH9DH/ICH9DO), only difference to ICH9: LPC */
+#define PCI_DEVICE_ID_INTEL_82801IR_LPC		0x2916
+#define PCI_DEVICE_ID_INTEL_82801IO_LPC		0x2914
+#define PCI_DEVICE_ID_INTEL_82801IH_LPC		0x2912
+
 /* Intel 82801E (C-ICH) */
 #define PCI_DEVICE_ID_INTEL_82801E_LPC		0x2450
 #define PCI_DEVICE_ID_INTEL_82801E_USB		0x2452
@@ -1969,20 +2300,22 @@
 #define PCI_DEVICE_ID_INTEL_82820FW_5 0x244b
 #define PCI_DEVICE_ID_INTEL_82820FW_6 0x244e
 
-#define PCI_DEVICE_ID_INTEL_6300ESB_ISA  0x25a1
-#define PCI_DEVICE_ID_INTEL_6300ESB_AC97_AUDIO 0x25a6
-#define PCI_DEVICE_ID_INTEL_6300ESB_AC97_MODEM 0x25a7
-#define PCI_DEVICE_ID_INTEL_6300ESB_EHCI 0x25ad
-#define PCI_DEVICE_ID_INTEL_6300ESB_IDE  0x25a2
-#define PCI_DEVICE_ID_INTEL_6300ESB_PCI  0x244e
-#define PCI_DEVICE_ID_INTEL_6300ESB_USB  0x25a9
-#define PCI_DEVICE_ID_INTEL_6300ESB_SMB  0x25a4
-#define PCI_DEVICE_ID_INTEL_6300ESB_USB2 0x25aa
-#define PCI_DEVICE_ID_INTEL_6300ESB_USB3 0x25ad
-#define PCI_DEVICE_ID_INTEL_6300ESB_SATA 0x25a3
-#define PCI_DEVICE_ID_INTEL_6300ESB_SATA_R 0x25b0
-#define PCI_DEVICE_ID_INTEL_6300ESB_PIC1 0x25ac
-#define PCI_DEVICE_ID_INTEL_6300ESB_BRIDGE1C 0x25ae
+/* Intel 6300ESB */
+#define PCI_DEVICE_ID_INTEL_6300ESB_LPC		0x25a1
+#define PCI_DEVICE_ID_INTEL_6300ESB_AC97_AUDIO	0x25a6
+#define PCI_DEVICE_ID_INTEL_6300ESB_AC97_MODEM	0x25a7
+#define PCI_DEVICE_ID_INTEL_6300ESB_EHCI	0x25ad
+#define PCI_DEVICE_ID_INTEL_6300ESB_IDE		0x25a2
+#define PCI_DEVICE_ID_INTEL_6300ESB_PCI		0x244e
+#define PCI_DEVICE_ID_INTEL_6300ESB_USB1	0x25a9
+#define PCI_DEVICE_ID_INTEL_6300ESB_SMB		0x25a4
+#define PCI_DEVICE_ID_INTEL_6300ESB_USB2	0x25aa
+#define PCI_DEVICE_ID_INTEL_6300ESB_SATA	0x25a3
+#define PCI_DEVICE_ID_INTEL_6300ESB_SATA_RAID	0x25b0
+#define PCI_DEVICE_ID_INTEL_6300ESB_APIC1	0x25ac
+#define PCI_DEVICE_ID_INTEL_6300ESB_PCI_X	0x25ae
+#define PCI_DEVICE_ID_INTEL_6300ESB_WDT		0x25ab
+
 #define PCI_DEVICE_ID_INTEL_80310	0x530d
 #define PCI_DEVICE_ID_INTEL_82810_MC1	0x7120
 #define PCI_DEVICE_ID_INTEL_82810_IG1	0x7121
diff --git a/src/mainboard/supermicro/x6dai_g/reset.c b/src/mainboard/supermicro/x6dai_g/reset.c
index 1d7f5a3301..dd9b603279 100644
--- a/src/mainboard/supermicro/x6dai_g/reset.c
+++ b/src/mainboard/supermicro/x6dai_g/reset.c
@@ -26,7 +26,7 @@ void full_reset(void)
 {
 	device_t dev;
 	/* Enable power on after power fail... */
-	dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_6300ESB_ISA), 0);
+	dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_6300ESB_LPC), 0);
 	if (dev != PCI_DEV_INVALID) {
 		unsigned byte;
 		byte = pci_read_config8(dev, 0xa4);
diff --git a/src/southbridge/intel/esb6300/esb6300.c b/src/southbridge/intel/esb6300/esb6300.c
index 162771d7dc..11110191f7 100644
--- a/src/southbridge/intel/esb6300/esb6300.c
+++ b/src/southbridge/intel/esb6300/esb6300.c
@@ -22,11 +22,11 @@ void esb6300_enable(device_t dev)
 		return;
 	}
 	if ((lpc_dev->vendor != PCI_VENDOR_ID_INTEL) ||
-		(lpc_dev->device != PCI_DEVICE_ID_INTEL_6300ESB_ISA)) {
+		(lpc_dev->device != PCI_DEVICE_ID_INTEL_6300ESB_LPC)) {
 		uint32_t id;
 		id = pci_read_config32(lpc_dev, PCI_VENDOR_ID);
 		if (id != (PCI_VENDOR_ID_INTEL | 
-				(PCI_DEVICE_ID_INTEL_6300ESB_ISA << 16))) {
+				(PCI_DEVICE_ID_INTEL_6300ESB_LPC << 16))) {
 			return;
 		}
 	}
diff --git a/src/southbridge/intel/esb6300/esb6300_bridge1c.c b/src/southbridge/intel/esb6300/esb6300_bridge1c.c
index 77ee8b5588..50bae9fb2a 100644
--- a/src/southbridge/intel/esb6300/esb6300_bridge1c.c
+++ b/src/southbridge/intel/esb6300/esb6300_bridge1c.c
@@ -46,6 +46,6 @@ static struct device_operations pci_ops  = {
 static const struct pci_driver pci_driver __pci_driver = {
 	.ops    = &pci_ops,
 	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_6300ESB_BRIDGE1C,
+	.device = PCI_DEVICE_ID_INTEL_6300ESB_PCI_X,
 };
 
diff --git a/src/southbridge/intel/esb6300/esb6300_lpc.c b/src/southbridge/intel/esb6300/esb6300_lpc.c
index a704b756c1..52db05b6a4 100644
--- a/src/southbridge/intel/esb6300/esb6300_lpc.c
+++ b/src/southbridge/intel/esb6300/esb6300_lpc.c
@@ -406,5 +406,5 @@ static struct device_operations lpc_ops  = {
 static const struct pci_driver lpc_driver __pci_driver = {
 	.ops    = &lpc_ops,
 	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_6300ESB_ISA,
+	.device = PCI_DEVICE_ID_INTEL_6300ESB_LPC,
 };
diff --git a/src/southbridge/intel/esb6300/esb6300_pic.c b/src/southbridge/intel/esb6300/esb6300_pic.c
index 71d70e956b..97635ae524 100644
--- a/src/southbridge/intel/esb6300/esb6300_pic.c
+++ b/src/southbridge/intel/esb6300/esb6300_pic.c
@@ -104,6 +104,6 @@ static struct device_operations pci_ops  = {
 static const struct pci_driver pci_driver __pci_driver = {
 	.ops    = &pci_ops,
 	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_6300ESB_PIC1,
+	.device = PCI_DEVICE_ID_INTEL_6300ESB_APIC1,
 };
 
diff --git a/src/southbridge/intel/esb6300/esb6300_sata.c b/src/southbridge/intel/esb6300/esb6300_sata.c
index 9c5c782170..0bedd93a9a 100644
--- a/src/southbridge/intel/esb6300/esb6300_sata.c
+++ b/src/southbridge/intel/esb6300/esb6300_sata.c
@@ -72,6 +72,6 @@ static const struct pci_driver sata_driver __pci_driver = {
 static const struct pci_driver sata_driver_nr __pci_driver = {
         .ops    = &sata_ops,
         .vendor = PCI_VENDOR_ID_INTEL,
-        .device = PCI_DEVICE_ID_INTEL_6300ESB_SATA_R,
+        .device = PCI_DEVICE_ID_INTEL_6300ESB_SATA_RAID,
 };
 
diff --git a/src/southbridge/intel/esb6300/esb6300_uhci.c b/src/southbridge/intel/esb6300/esb6300_uhci.c
index efb106d8f6..9184ed24e4 100644
--- a/src/southbridge/intel/esb6300/esb6300_uhci.c
+++ b/src/southbridge/intel/esb6300/esb6300_uhci.c
@@ -36,10 +36,10 @@ static struct device_operations uhci_ops  = {
 	.ops_pci          = &lops_pci,
 };
 
-static const struct pci_driver uhci_driver __pci_driver = {
+static const struct pci_driver usb1_driver __pci_driver = {
 	.ops    = &uhci_ops,
 	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_6300ESB_USB,
+	.device = PCI_DEVICE_ID_INTEL_6300ESB_USB1,
 };
 
 static const struct pci_driver usb2_driver __pci_driver = {
@@ -48,9 +48,10 @@ static const struct pci_driver usb2_driver __pci_driver = {
 	.device = PCI_DEVICE_ID_INTEL_6300ESB_USB2,
 };
 
-static const struct pci_driver usb3_driver __pci_driver = {
+/* Note: May or may not need different init than UHCI. */
+static const struct pci_driver ehci_driver __pci_driver = {
 	.ops    = &uhci_ops,
 	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_6300ESB_USB3,
+	.device = PCI_DEVICE_ID_INTEL_6300ESB_EHCI,
 };