summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/inteltool/gpio.c10
-rw-r--r--util/inteltool/gpio_groups.c10
-rw-r--r--util/inteltool/inteltool.c26
-rw-r--r--util/inteltool/inteltool.h10
-rw-r--r--util/inteltool/pcr.c10
-rw-r--r--util/inteltool/powermgt.c10
-rw-r--r--util/inteltool/rootcmplx.c10
-rw-r--r--util/inteltool/spi.c20
8 files changed, 73 insertions, 33 deletions
diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 41f4df90c8..c946d5c65f 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -1028,9 +1028,13 @@ int print_gpios(struct pci_dev *sb, int show_all, int show_diffs)
case PCI_DEVICE_ID_INTEL_CM236:
case PCI_DEVICE_ID_INTEL_APL_LPC:
case PCI_DEVICE_ID_INTEL_DNV_LPC:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM:
diff --git a/util/inteltool/gpio_groups.c b/util/inteltool/gpio_groups.c
index 8b328a7383..21e2de93d5 100644
--- a/util/inteltool/gpio_groups.c
+++ b/util/inteltool/gpio_groups.c
@@ -1778,9 +1778,13 @@ void print_gpio_groups(struct pci_dev *const sb)
communities = sunrise_communities;
pcr_init(sb);
break;
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM:
diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index e89fd3cf22..40e7646450 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -224,18 +224,26 @@ static const struct {
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BAYTRAIL_LPC, "Bay Trail" },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_PRE,
"Sunrise Point Desktop Engineering Sample" },
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE,
- "Sunrise Point-LP U Base" },
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM,
- "Sunrise Point-LP U Premium" },
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM,
- "Sunrise Point-LP Y Premium" },
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE,
+ "Sunrise Point-LP Engineering Sample" },
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL,
+ "Sunrise Point-LP U Base/Skylake" },
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL,
+ "Sunrise Point-LP Y Premium/Skylake" },
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL,
+ "Sunrise Point-LP U Premium/Skylake" },
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL,
+ "Sunrise Point-LP U Base/Kabylake" },
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL,
+ "Sunrise Point-LP Y Premium/Kabylake" },
+ { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL,
+ "Sunrise Point-LP U Premium/Kabylake" },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE,
- "Sunrise Point-LP U iHDCP 2.2 Base" },
+ "Sunrise Point-LP U iHDCP 2.2 Base/Kabylake" },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM,
- "Sunrise Point-LP U iHDCP 2.2 Premium" },
+ "Sunrise Point-LP U iHDCP 2.2 Premium/Kabylake" },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM,
- "Sunrise Point-LP Y iHDCP 2.2 Premium" },
+ "Sunrise Point-LP Y iHDCP 2.2 Premium/Kabylake" },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H110, "H110" },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_H170, "H170" },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_Z170, "Z170" },
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index 25b3a1504a..6aec3879c2 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -145,9 +145,13 @@ static inline uint32_t inl(unsigned port)
#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_P2SB 0xa120
#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_PRE 0xa141
#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_SATA 0x9d03
-#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE 0x9d53
-#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM 0x9d58
-#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM 0x9d56
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE 0x9d41
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL 0x9d43
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL 0x9d46
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL 0x9d48
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL 0x9d53
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL 0x9d56
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL 0x9d58
#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE 0x9d50
#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM 0x9d4e
#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM 0x9d4b
diff --git a/util/inteltool/pcr.c b/util/inteltool/pcr.c
index a296b19be4..c969620fa0 100644
--- a/util/inteltool/pcr.c
+++ b/util/inteltool/pcr.c
@@ -79,9 +79,13 @@ void pcr_init(struct pci_dev *const sb)
switch (sb->device_id) {
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_PRE:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM:
diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c
index 359180093d..675e31a1da 100644
--- a/util/inteltool/powermgt.c
+++ b/util/inteltool/powermgt.c
@@ -745,9 +745,13 @@ int print_pmbase(struct pci_dev *sb, struct pci_access *pacc)
case PCI_DEVICE_ID_INTEL_C224:
case PCI_DEVICE_ID_INTEL_C226:
case PCI_DEVICE_ID_INTEL_H81:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM:
diff --git a/util/inteltool/rootcmplx.c b/util/inteltool/rootcmplx.c
index ddcd8e3ed3..70d7cbe3ed 100644
--- a/util/inteltool/rootcmplx.c
+++ b/util/inteltool/rootcmplx.c
@@ -112,9 +112,13 @@ int print_rcba(struct pci_dev *sb)
case PCI_DEVICE_ID_INTEL_C224:
case PCI_DEVICE_ID_INTEL_C226:
case PCI_DEVICE_ID_INTEL_H81:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM:
diff --git a/util/inteltool/spi.c b/util/inteltool/spi.c
index cb38c55587..da5533deaa 100644
--- a/util/inteltool/spi.c
+++ b/util/inteltool/spi.c
@@ -175,9 +175,13 @@ int print_bioscntl(struct pci_dev *sb)
case PCI_DEVICE_ID_INTEL_C224:
case PCI_DEVICE_ID_INTEL_C226:
case PCI_DEVICE_ID_INTEL_H81:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM:
@@ -309,9 +313,13 @@ int print_spibar(struct pci_dev *sb) {
case PCI_DEVICE_ID_INTEL_C224:
case PCI_DEVICE_ID_INTEL_C226:
case PCI_DEVICE_ID_INTEL_H81:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM:
- case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL:
+ case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_PREM:
case PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_IHDCP_PREM: