[coreboot] [commit] r5709 - trunk/util/inteltool

[repository service]

Author: stepan
Date: Tue Aug 17 10:33:44 2010
New Revision: 5709
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5709

Log:
Add support for the Intel NM10 (a variant of ICH7) and ICH8 southbridges.
Both are tested and appear to be working, however I'm not 100% clear
on if the NM10 has any other PCI IDs.

Signed-off-by: Corey Osgood <corey.osgood at gmail.com>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Paul Menzel <paulepanter at users.sourceforge.net>

Modified:
   trunk/util/inteltool/gpio.c
   trunk/util/inteltool/inteltool.c
   trunk/util/inteltool/inteltool.h
   trunk/util/inteltool/powermgt.c
   trunk/util/inteltool/rootcmplx.c

Modified: trunk/util/inteltool/gpio.c
==============================================================================
--- trunk/util/inteltool/gpio.c	Tue Aug 17 10:24:01 2010	(r5708)
+++ trunk/util/inteltool/gpio.c	Tue Aug 17 10:33:44 2010	(r5709)
@@ -171,6 +171,7 @@
 		gpio_registers = ich9_gpio_registers;
 		size = ARRAY_SIZE(ich9_gpio_registers);
 		break;
+	case PCI_DEVICE_ID_INTEL_ICH8:
 	case PCI_DEVICE_ID_INTEL_ICH8M:
 		gpiobase = pci_read_word(sb, 0x48) & 0xfffc;
 		gpio_registers = ich8_gpio_registers;
@@ -180,6 +181,7 @@
 	case PCI_DEVICE_ID_INTEL_ICH7M:
 	case PCI_DEVICE_ID_INTEL_ICH7DH:
 	case PCI_DEVICE_ID_INTEL_ICH7MDH:
+	case PCI_DEVICE_ID_INTEL_NM10:
 		gpiobase = pci_read_word(sb, 0x48) & 0xfffc;
 		gpio_registers = ich7_gpio_registers;
 		size = ARRAY_SIZE(ich7_gpio_registers);

Modified: trunk/util/inteltool/inteltool.c
==============================================================================
--- trunk/util/inteltool/inteltool.c	Tue Aug 17 10:24:01 2010	(r5708)
+++ trunk/util/inteltool/inteltool.c	Tue Aug 17 10:33:44 2010	(r5709)
@@ -61,6 +61,8 @@
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9M, "ICH9M" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9ME, "ICH9M-E" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8M, "ICH8-M" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8, "ICH8" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_NM10, "NM10" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7MDH, "ICH7-M DH" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7M, "ICH7-M" },
 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7, "ICH7" },

Modified: trunk/util/inteltool/inteltool.h
==============================================================================
--- trunk/util/inteltool/inteltool.h	Tue Aug 17 10:24:01 2010	(r5708)
+++ trunk/util/inteltool/inteltool.h	Tue Aug 17 10:33:44 2010	(r5709)
@@ -43,6 +43,8 @@
 #define PCI_DEVICE_ID_INTEL_ICH7		0x27b8
 #define PCI_DEVICE_ID_INTEL_ICH7M		0x27b9
 #define PCI_DEVICE_ID_INTEL_ICH7MDH		0x27bd
+#define PCI_DEVICE_ID_INTEL_NM10		0x27bc
+#define PCI_DEVICE_ID_INTEL_ICH8		0x2810
 #define PCI_DEVICE_ID_INTEL_ICH8M		0x2815
 #define PCI_DEVICE_ID_INTEL_ICH9DH		0x2912
 #define PCI_DEVICE_ID_INTEL_ICH9DO		0x2914

Modified: trunk/util/inteltool/powermgt.c
==============================================================================
--- trunk/util/inteltool/powermgt.c	Tue Aug 17 10:24:01 2010	(r5708)
+++ trunk/util/inteltool/powermgt.c	Tue Aug 17 10:33:44 2010	(r5709)
@@ -477,6 +477,7 @@
 	case PCI_DEVICE_ID_INTEL_ICH7M:
 	case PCI_DEVICE_ID_INTEL_ICH7DH:
 	case PCI_DEVICE_ID_INTEL_ICH7MDH:
+	case PCI_DEVICE_ID_INTEL_NM10:
 		pmbase = pci_read_word(sb, 0x40) & 0xfffc;
 		pm_registers = ich7_pm_registers;
 		size = ARRAY_SIZE(ich7_pm_registers);
@@ -491,6 +492,7 @@
 		pm_registers = ich9_pm_registers;
 		size = ARRAY_SIZE(ich9_pm_registers);
 		break;
+	case PCI_DEVICE_ID_INTEL_ICH8:
 	case PCI_DEVICE_ID_INTEL_ICH8M:
 		pmbase = pci_read_word(sb, 0x40) & 0xfffc;
 		pm_registers = ich8_pm_registers;

Modified: trunk/util/inteltool/rootcmplx.c
==============================================================================
--- trunk/util/inteltool/rootcmplx.c	Tue Aug 17 10:24:01 2010	(r5708)
+++ trunk/util/inteltool/rootcmplx.c	Tue Aug 17 10:33:44 2010	(r5709)
@@ -43,6 +43,8 @@
 	case PCI_DEVICE_ID_INTEL_ICH9M:
 	case PCI_DEVICE_ID_INTEL_ICH9ME:
 	case PCI_DEVICE_ID_INTEL_ICH8M:
+	case PCI_DEVICE_ID_INTEL_ICH8:
+	case PCI_DEVICE_ID_INTEL_NM10:
 		rcba_phys = pci_read_long(sb, 0xf0) & 0xfffffffe;
 		break;
 	case PCI_DEVICE_ID_INTEL_ICH: