[coreboot-gerrit] Patch set updated for coreboot: aa93de7 util/inteltool: fix ibex peak register definition

[Alexander Couzens (lynxis@fe80.eu)]

Alexander Couzens (lynxis at fe80.eu) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7029

-gerrit

commit aa93de77d5128366c8856acb11580df8fb0ece63
Author: Alexander Couzens <lynxis at fe80.eu>
Date:   Wed Oct 8 03:52:49 2014 +0200

    util/inteltool: fix ibex peak register definition
    
    Ibex peak is the first pch chipset. See Intel documentation 5 series Chipset.
    
    Change-Id: Ic506bd8d4a6a6eabeb990f9a09ad7805b32b51f7
    Signed-off-by: Alexander Couzens <lynxis at fe80.eu>
---
 util/inteltool/gpio.c     | 38 +++++++++++++++++++++++---------------
 util/inteltool/powermgt.c | 30 +++++++++++++++---------------
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 49c1325..dfb0819 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -406,6 +406,29 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs)
 		printf("\n============= GPIOS =============\n\n");
 
 	switch (sb->device_id) {
+	case PCI_DEVICE_ID_INTEL_3400_DESKTOP:
+	case PCI_DEVICE_ID_INTEL_P55:
+	case PCI_DEVICE_ID_INTEL_H55:
+	case PCI_DEVICE_ID_INTEL_H57:
+	case PCI_DEVICE_ID_INTEL_Q57:
+	case PCI_DEVICE_ID_INTEL_3400:
+	case PCI_DEVICE_ID_INTEL_3420:
+	case PCI_DEVICE_ID_INTEL_3450:
+		gpiobase = pci_read_word(sb, 0x48) & 0xfffc;
+		gpio_registers = pch_gpio_registers;
+		size = ARRAY_SIZE(pch_gpio_registers);
+		break;
+	case PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF:
+	case PCI_DEVICE_ID_INTEL_3400_MOBILE:
+	case PCI_DEVICE_ID_INTEL_HM57:
+	case PCI_DEVICE_ID_INTEL_HM55:
+	case PCI_DEVICE_ID_INTEL_QM57:
+	case PCI_DEVICE_ID_INTEL_QS57:
+	case PCI_DEVICE_ID_INTEL_PM55:
+		gpiobase = pci_read_word(sb, 0x48) & 0xfffc;
+		gpio_registers = pch_gpio_registers;
+		size = ARRAY_SIZE(pch_gpio_registers);
+		break;
 	case PCI_DEVICE_ID_INTEL_Z68:
 	case PCI_DEVICE_ID_INTEL_P67:
 	case PCI_DEVICE_ID_INTEL_H67:
@@ -523,22 +546,7 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs)
 		size = ARRAY_SIZE(i631x_gpio_registers);
 		break;
 
-	case PCI_DEVICE_ID_INTEL_3400_DESKTOP:
-	case PCI_DEVICE_ID_INTEL_3400_MOBILE:
-	case PCI_DEVICE_ID_INTEL_P55:
-	case PCI_DEVICE_ID_INTEL_PM55:
-	case PCI_DEVICE_ID_INTEL_H55:
-	case PCI_DEVICE_ID_INTEL_QM57:
-	case PCI_DEVICE_ID_INTEL_H57:
-	case PCI_DEVICE_ID_INTEL_HM55:
-	case PCI_DEVICE_ID_INTEL_Q57:
-	case PCI_DEVICE_ID_INTEL_HM57:
-	case PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF:
 	case PCI_DEVICE_ID_INTEL_B55_A:
-	case PCI_DEVICE_ID_INTEL_QS57:
-	case PCI_DEVICE_ID_INTEL_3400:
-	case PCI_DEVICE_ID_INTEL_3420:
-	case PCI_DEVICE_ID_INTEL_3450:
 	case PCI_DEVICE_ID_INTEL_B55_B:
 		gpiobase = pci_read_word(sb, 0x48) & 0xfffc;
 		gpio_registers = i631x_gpio_registers;
diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c
index 3bc4efc..4829301 100644
--- a/util/inteltool/powermgt.c
+++ b/util/inteltool/powermgt.c
@@ -656,6 +656,21 @@ int print_pmbase(struct pci_dev *sb, struct pci_access *pacc)
 	printf("\n============= PMBASE ============\n\n");
 
 	switch (sb->device_id) {
+	case PCI_DEVICE_ID_INTEL_3400:
+	case PCI_DEVICE_ID_INTEL_3400_DESKTOP:
+	case PCI_DEVICE_ID_INTEL_3400_MOBILE:
+	case PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF:
+	case PCI_DEVICE_ID_INTEL_3420:
+	case PCI_DEVICE_ID_INTEL_3450:
+	case PCI_DEVICE_ID_INTEL_H55:
+	case PCI_DEVICE_ID_INTEL_H57:
+	case PCI_DEVICE_ID_INTEL_HM55:
+	case PCI_DEVICE_ID_INTEL_HM57:
+	case PCI_DEVICE_ID_INTEL_P55:
+	case PCI_DEVICE_ID_INTEL_PM55:
+	case PCI_DEVICE_ID_INTEL_Q57:
+	case PCI_DEVICE_ID_INTEL_QM57:
+	case PCI_DEVICE_ID_INTEL_QS57:
 	case PCI_DEVICE_ID_INTEL_Z68:
 	case PCI_DEVICE_ID_INTEL_P67:
 	case PCI_DEVICE_ID_INTEL_UM67:
@@ -761,22 +776,7 @@ int print_pmbase(struct pci_dev *sb, struct pci_access *pacc)
 		size = ARRAY_SIZE(i63xx_pm_registers);
 		break;
 
-	case PCI_DEVICE_ID_INTEL_3400_DESKTOP:
-	case PCI_DEVICE_ID_INTEL_3400_MOBILE:
-	case PCI_DEVICE_ID_INTEL_P55:
-	case PCI_DEVICE_ID_INTEL_PM55:
-	case PCI_DEVICE_ID_INTEL_H55:
-	case PCI_DEVICE_ID_INTEL_QM57:
-	case PCI_DEVICE_ID_INTEL_H57:
-	case PCI_DEVICE_ID_INTEL_HM55:
-	case PCI_DEVICE_ID_INTEL_Q57:
-	case PCI_DEVICE_ID_INTEL_HM57:
-	case PCI_DEVICE_ID_INTEL_3400_MOBILE_SFF:
 	case PCI_DEVICE_ID_INTEL_B55_A:
-	case PCI_DEVICE_ID_INTEL_QS57:
-	case PCI_DEVICE_ID_INTEL_3400:
-	case PCI_DEVICE_ID_INTEL_3420:
-	case PCI_DEVICE_ID_INTEL_3450:
 	case PCI_DEVICE_ID_INTEL_B55_B:
 		pmbase = pci_read_word(sb, 0x40) & 0xfffc;
 		pm_registers = i63xx_pm_registers;