[coreboot-gerrit] Change in coreboot[master]: util/inteltool: Add some Skylake desktop ids

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/25144

Change subject: util/inteltool: Add some Skylake desktop ids
......................................................................

util/inteltool: Add some Skylake desktop ids

Change-Id: I1738a2544eb2435cb4b8718bcce5170d1ef04f72
Signed-off-by: Nico Huber 
---
M util/inteltool/gpio.c
M util/inteltool/gpio_groups.c
M util/inteltool/inteltool.c
M util/inteltool/inteltool.h
M util/inteltool/memory.c
5 files changed, 6 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/25144/1

diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 594959a..e561282 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -1005,6 +1005,7 @@
    	gpio_registers = baytrail_score_ssus_gpio_registers;
    	size = ARRAY_SIZE(baytrail_score_ssus_gpio_registers);
    	break;
+	case PCI_DEVICE_ID_INTEL_B150:
    case PCI_DEVICE_ID_INTEL_CM236:
    	print_gpio_groups(sb, false);
    	return 0;
diff --git a/util/inteltool/gpio_groups.c b/util/inteltool/gpio_groups.c
index dd66f03..3937507 100644
--- a/util/inteltool/gpio_groups.c
+++ b/util/inteltool/gpio_groups.c
@@ -566,6 +566,7 @@
    const struct gpio_community *const *communities;

switch (sb->device_id) {
+	case PCI_DEVICE_ID_INTEL_B150:
    case PCI_DEVICE_ID_INTEL_CM236:
    	community_count = ARRAY_SIZE(sunrise_communities);
    	communities = sunrise_communities;
diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index c9f961a..6429a7c 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -122,6 +122,8 @@
      "6th generation (Skylake-S/H family) Core Processor (Workstation)" },
    { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D,
      "6th generation (Skylake-S family) Core Processor (Desktop)" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D2,
+	  "6th generation (Skylake-S family) Core Processor (Desktop)" },
    { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BAYTRAIL, "Bay Trail" },
    /* Southbridges (LPC controllers) */
    { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371XX, "371AB/EB/MB" },
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index 016199d..736d5f1 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -227,6 +227,7 @@
 #define PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_E3	0x0c08 /* Haswell (Xeon E3 v3) */
 #define PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_U	0x0a04 /* Haswell-ULT */
 #define PCI_DEVICE_ID_INTEL_CORE_5TH_GEN_U	0x1604 /* Broadwell-ULT */
+#define PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D2	0x190f /* Skylake (Desktop) */
 #define PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_M	0x1910 /* Skylake (Mobile) */
 #define PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_WST	0x1918 /* Skylake (Workstation) */
 #define PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D	0x191f /* Skylake (Desktop) */
diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c
index 67a29a7..7f05ebc 100644
--- a/util/inteltool/memory.c
+++ b/util/inteltool/memory.c
@@ -218,6 +218,7 @@
    case PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_E3:
    case PCI_DEVICE_ID_INTEL_CORE_4TH_GEN_U:
    case PCI_DEVICE_ID_INTEL_CORE_5TH_GEN_U:
+	case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D:
    case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_WST:
    case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_D:
    case PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_M: