inteltool: Add definitions for Cougar/Panther Point PCI IDs

This adds correspondings #defines for the PCI IDs of the LPC device on
Intel's Cougar Point and Panther Point platform controller hubs. Those
will be used more in later commits.

I've checked all those IDs against the specification updates [1] and [2].

[1] Intel 6 Series Chipset and Intel C200 Series Chipset Specification
    Update
    Document-Number: 324646-019

[2] Intel 7 Series / C216 Chipset Family Platform Controller Hub (PCH)
    Family - Datasheet Specification Update
    Document-Number: 326777-010

Change-Id: Ibef5a30d283c568c345eb8d8149723e7a3049272
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: http://review.coreboot.org/2960
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

2 files changed, 60 insertions, 30 deletions

diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index be2b721e20..d56d0580fa 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -119,38 +119,38 @@ static const struct {
 	{ PCI_VENDOR_ID_INTEL, 0x3b14, "3420" },
 	{ PCI_VENDOR_ID_INTEL, 0x3b16, "3450" },
 	{ PCI_VENDOR_ID_INTEL, 0x3b1e, "B55" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c44, "Z68" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c46, "P67" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c47, "UM67" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c49, "HM65" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c4a, "H67" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c4b, "HM67" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c4c, "Q65" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c4d, "QS67" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c4e, "Q67" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c4f, "QM67" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c50, "B65" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c52, "C202" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c54, "C204" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c56, "C206" },
-	{ PCI_VENDOR_ID_INTEL, 0x1c5c, "H61" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Z68, "Z68" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_P67, "P67" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UM67, "UM67" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM65, "HM65" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H67, "H67" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM67, "HM67" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Q65, "Q65" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QS67, "QS67" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Q67, "Q67" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QM67, "QM67" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_B65, "B65" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C202, "C202" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C204, "C204" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C206, "C206" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H61, "H61" },
 	{ PCI_VENDOR_ID_INTEL, 0x1d40, "X79" },
 	{ PCI_VENDOR_ID_INTEL, 0x1d41, "X79" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e44, "Z77" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e46, "Z75" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e47, "Q77" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e48, "Q75" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e49, "B75" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e4a, "H77" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e53, "C216" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e55, "QM77" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e56, "QS77" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e57, "HM77" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e58, "UM77" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e59, "HM76" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e5d, "HM75" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e5e, "HM70" },
-	{ PCI_VENDOR_ID_INTEL, 0x1e5f, "NM70" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Z77, "Z77" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Z75, "Z75" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Q77, "Q77" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Q75, "Q75" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_B75, "B75" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H77, "H77" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_C216, "C216" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QM77, "QM77" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QS77, "QS77" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM77, "HM77" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UM77, "UM77" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM76, "HM76" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM75, "HM75" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_HM70, "HM70" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_NM70, "NM70" },
 	{ PCI_VENDOR_ID_INTEL, 0x2310, "DH89xxCC" },
 };
 
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index 00adc68446..ac23fe143a 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -61,6 +61,36 @@
 #define PCI_DEVICE_ID_INTEL_ICH9ME		0x2917
 #define PCI_DEVICE_ID_INTEL_ICH10R		0x3a16
 #define PCI_DEVICE_ID_INTEL_SCH_POULSBO_LPC	0x8119
+#define PCI_DEVICE_ID_INTEL_Z68			0x1c44
+#define PCI_DEVICE_ID_INTEL_P67			0x1c46
+#define PCI_DEVICE_ID_INTEL_UM67		0x1c47
+#define PCI_DEVICE_ID_INTEL_HM65		0x1c49
+#define PCI_DEVICE_ID_INTEL_H67			0x1c4a
+#define PCI_DEVICE_ID_INTEL_HM67		0x1c4b
+#define PCI_DEVICE_ID_INTEL_Q65			0x1c4c
+#define PCI_DEVICE_ID_INTEL_QS67		0x1c4d
+#define PCI_DEVICE_ID_INTEL_Q67			0x1c4e
+#define PCI_DEVICE_ID_INTEL_QM67		0x1c4f
+#define PCI_DEVICE_ID_INTEL_B65			0x1c50
+#define PCI_DEVICE_ID_INTEL_C202		0x1c52
+#define PCI_DEVICE_ID_INTEL_C204		0x1c54
+#define PCI_DEVICE_ID_INTEL_C206		0x1c56
+#define PCI_DEVICE_ID_INTEL_H61			0x1c5c
+#define PCI_DEVICE_ID_INTEL_Z77			0x1e44
+#define PCI_DEVICE_ID_INTEL_Z75			0x1e46
+#define PCI_DEVICE_ID_INTEL_Q77			0x1e47
+#define PCI_DEVICE_ID_INTEL_Q75			0x1e48
+#define PCI_DEVICE_ID_INTEL_B75			0x1e49
+#define PCI_DEVICE_ID_INTEL_H77			0x1e4a
+#define PCI_DEVICE_ID_INTEL_C216		0x1e53
+#define PCI_DEVICE_ID_INTEL_QM77		0x1e55
+#define PCI_DEVICE_ID_INTEL_QS77		0x1e56
+#define PCI_DEVICE_ID_INTEL_HM77		0x1e57
+#define PCI_DEVICE_ID_INTEL_UM77		0x1e58
+#define PCI_DEVICE_ID_INTEL_HM76		0x1e59
+#define PCI_DEVICE_ID_INTEL_HM75		0x1e5d
+#define PCI_DEVICE_ID_INTEL_HM70		0x1e5e
+#define PCI_DEVICE_ID_INTEL_NM70		0x1e5f
 
 #define PCI_DEVICE_ID_INTEL_82810		0x7120
 #define PCI_DEVICE_ID_INTEL_82810_DC	0x7122