Change in ...coreboot[master]: util/inteltool: Add Sunrise Point LP (Skylake) IDs

[Felix Singer (Code Review)]

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31506

Change subject: util/inteltool: Add Sunrise Point LP (Skylake) IDs
......................................................................

util/inteltool: Add Sunrise Point LP (Skylake) IDs

Change-Id: Id46224fcc44b06c91cbcd6c74a55c95e1de65ec6
Signed-off-by: Felix Singer 
---
M util/inteltool/inteltool.c
M util/inteltool/inteltool.h
2 files changed, 18 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/31506/1

diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index 93a7ffe..bdcee02 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -224,11 +224,19 @@
    { 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,
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE,
+	  "Sunrise Point Mobile Engineering Sample" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_1,
      "Sunrise Point-LP U Base" },
-	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM,
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_2,
+	  "Sunrise Point-LP U Base" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_1,
      "Sunrise Point-LP U Premium" },
-	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM,
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_2,
+	  "Sunrise Point-LP U Premium" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_1,
+	  "Sunrise Point-LP Y Premium" },
+	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_2,
      "Sunrise Point-LP Y Premium" },
    { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_IHDCP_BASE,
      "Sunrise Point-LP U iHDCP 2.2 Base" },
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index fb64811..9fbe9b5 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -144,10 +144,14 @@
 #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_SATA		0xa102
 #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_P2SB		0xa120
 #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_PRE		0xa141
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE		0x9d41
 #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_U_BASE_1	0x9d43
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_2	0x9d53
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_1	0x9d48
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_2	0x9d58
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_1	0x9d46
+#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_2	0x9d56
 #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

Change in ...coreboot[master]: inteltool: Add Sunrise Point LP (Skylake) PCH IDs

[Felix Singer (Code Review)]

Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31506 )

Change subject: inteltool: Add Sunrise Point LP (Skylake) PCH IDs
......................................................................

Patch Set 6:

This change is ready for review.

Change in ...coreboot[master]: inteltool: Add Sunrise Point-LP Skylake PCH IDs

[Felix Singer (Code Review)]

Hello Paul Menzel, Stefan Reinauer, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/31506

to look at the new patch set (#7).

Change subject: inteltool: Add Sunrise Point-LP Skylake PCH IDs
......................................................................

inteltool: Add Sunrise Point-LP Skylake PCH IDs

Sunrise Point-LP is used on Skylake and KabyLake platforms,
but the PCH IDs differ.

This commit adds the PCH IDs for Skylake mobile platforms
and renames the Kabylake macros to distinguish them.

Used Intel documents:
- 332995-001EN
- 332996-002EN

Change-Id: Id46224fcc44b06c91cbcd6c74a55c95e1de65ec6
Signed-off-by: Felix Singer 
---
M util/inteltool/gpio.c
M util/inteltool/gpio_groups.c
M util/inteltool/inteltool.c
M util/inteltool/inteltool.h
M util/inteltool/pcr.c
M util/inteltool/powermgt.c
M util/inteltool/rootcmplx.c
M util/inteltool/spi.c
8 files changed, 40 insertions(+), 28 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/31506/7

Change in ...coreboot[master]: inteltool: Add Sunrise Point-LP Skylake PCH IDs

[Felix Singer (Code Review)]

Hello Paul Menzel, Stefan Reinauer, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/31506

to look at the new patch set (#9).

Change subject: inteltool: Add Sunrise Point-LP Skylake PCH IDs
......................................................................

inteltool: Add Sunrise Point-LP Skylake PCH IDs

Sunrise Point-LP is used on Skylake and KabyLake platforms,
but the PCH IDs differ.

This commit adds the PCH IDs for Skylake mobile platforms
and renames the Kabylake macros to distinguish them.

Used Intel documents:
- 332995-001EN
- 332996-002EN

Change-Id: Id46224fcc44b06c91cbcd6c74a55c95e1de65ec6
Signed-off-by: Felix Singer 
---
M util/inteltool/gpio.c
M util/inteltool/gpio_groups.c
M util/inteltool/inteltool.c
M util/inteltool/inteltool.h
M util/inteltool/pcr.c
M util/inteltool/powermgt.c
M util/inteltool/rootcmplx.c
M util/inteltool/spi.c
8 files changed, 40 insertions(+), 28 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/31506/9

Change in ...coreboot[master]: inteltool: Add Sunrise Point-LP Skylake PCH IDs

[Felix Singer (Code Review)]

Hello Paul Menzel, Stefan Reinauer, build bot (Jenkins), Nico Huber,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/31506

to look at the new patch set (#10).

Change subject: inteltool: Add Sunrise Point-LP Skylake PCH IDs
......................................................................

inteltool: Add Sunrise Point-LP Skylake PCH IDs

Sunrise Point-LP is used on Skylake and KabyLake platforms,
but the PCH IDs differ.

This commit adds the PCH IDs for Skylake mobile platforms
and renames the Kabylake macros to distinguish them.

Used Intel documents:
- 332995-001EN (I/O datasheet vol. 1)

Change-Id: Id46224fcc44b06c91cbcd6c74a55c95e1de65ec6
Signed-off-by: Felix Singer 
---
M util/inteltool/gpio.c
M util/inteltool/gpio_groups.c
M util/inteltool/inteltool.c
M util/inteltool/inteltool.h
M util/inteltool/pcr.c
M util/inteltool/powermgt.c
M util/inteltool/rootcmplx.c
M util/inteltool/spi.c
8 files changed, 40 insertions(+), 28 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/31506/10

Change in ...coreboot[master]: inteltool: Add Sunrise Point-LP Skylake PCH IDs

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31506 )

Change subject: inteltool: Add Sunrise Point-LP Skylake PCH IDs
......................................................................

Patch Set 10:

(3 comments)

Do you plan to add the ids to each .c individually?
Maybe you can add them in this patch to all cases
where nothing changes (probably everything but GPIO)?

https://review.coreboot.org/#/c/31506/9/util/inteltool/inteltool.h 
File util/inteltool/inteltool.h:

https://review.coreboot.org/#/c/31506/9/util/inteltool/inteltool.h@147 
PS9, Line 147: #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE		0x9d41
moving below _LP_SATA would keep numerical order and PCH ids together

https://review.coreboot.org/#/c/31506/9/util/inteltool/inteltool.c 
File util/inteltool/inteltool.c:

https://review.coreboot.org/#/c/31506/9/util/inteltool/inteltool.c@228 
PS9, Line 228: Mobile
"Mobile" could also mean PCH-H, just use "Sunrise Point-LP" like below?

https://review.coreboot.org/#/c/31506/9/util/inteltool/inteltool.c@229 
PS9, Line 229: 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL,
             : 	  "Sunrise Point-LP U Base" },
             : 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL,
             : 	  "Sunrise Point-LP Y Premium" },
             : 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL,
             : 	  "Sunrise Point-LP U Premium" },
             : 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL,
             : 	  "Sunrise Point-LP U Base" },
             : 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL,
             : 	  "Sunrise Point-LP Y Premium" },
             : 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL,
             : 	  "Sunrise Point-LP U Premium" },
please mention Skylake/Kaby Lake in the strings, too

Change in ...coreboot[master]: inteltool: Add Sunrise Point-LP Skylake PCH IDs

[Felix Singer (Code Review)]

Hello Paul Menzel, Stefan Reinauer, build bot (Jenkins), Nico Huber,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/31506

to look at the new patch set (#11).

Change subject: inteltool: Add Sunrise Point-LP Skylake PCH IDs
......................................................................

inteltool: Add Sunrise Point-LP Skylake PCH IDs

Sunrise Point-LP is used on Skylake and KabyLake platforms,
but the PCH IDs differ.

This commit adds the PCH IDs for Skylake mobile platforms
and renames the Kabylake macros to distinguish them.

Used Intel documents:
- 332995-001EN (I/O datasheet vol. 1)

Change-Id: Id46224fcc44b06c91cbcd6c74a55c95e1de65ec6
Signed-off-by: Felix Singer 
---
M util/inteltool/gpio.c
M util/inteltool/gpio_groups.c
M util/inteltool/inteltool.c
M util/inteltool/inteltool.h
M util/inteltool/pcr.c
M util/inteltool/powermgt.c
M util/inteltool/rootcmplx.c
M util/inteltool/spi.c
8 files changed, 45 insertions(+), 33 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/31506/11

Change in ...coreboot[master]: inteltool: Add Sunrise Point-LP Skylake PCH IDs

[Felix Singer (Code Review)]

Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31506 )

Change subject: inteltool: Add Sunrise Point-LP Skylake PCH IDs
......................................................................

Patch Set 11:

(3 comments)

https://review.coreboot.org/#/c/31506/9/util/inteltool/inteltool.h 
File util/inteltool/inteltool.h:

https://review.coreboot.org/#/c/31506/9/util/inteltool/inteltool.h@147 
PS9, Line 147: #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_PRE		0x9d41
> moving below _LP_SATA would keep numerical order and PCH ids together

Done

https://review.coreboot.org/#/c/31506/9/util/inteltool/inteltool.c 
File util/inteltool/inteltool.c:

https://review.coreboot.org/#/c/31506/9/util/inteltool/inteltool.c@228 
PS9, Line 228: Mobile
> "Mobile" could also mean PCH-H, just use "Sunrise Point-LP" like below?

Done

https://review.coreboot.org/#/c/31506/9/util/inteltool/inteltool.c@229 
PS9, Line 229: 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_SKL,
             : 	  "Sunrise Point-LP U Base" },
             : 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_SKL,
             : 	  "Sunrise Point-LP Y Premium" },
             : 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_SKL,
             : 	  "Sunrise Point-LP U Premium" },
             : 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_BASE_KBL,
             : 	  "Sunrise Point-LP U Base" },
             : 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_Y_PREM_KBL,
             : 	  "Sunrise Point-LP Y Premium" },
             : 	{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_U_PREM_KBL,
             : 	  "Sunrise Point-LP U Premium" },
> please mention Skylake/Kaby Lake in the strings, too

Done

Change in ...coreboot[master]: inteltool: Add Sunrise Point-LP Skylake PCH IDs

[Felix Singer (Code Review)]

Hello Paul Menzel, Stefan Reinauer, build bot (Jenkins), Nico Huber,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/31506

to look at the new patch set (#12).

Change subject: inteltool: Add Sunrise Point-LP Skylake PCH IDs
......................................................................

inteltool: Add Sunrise Point-LP Skylake PCH IDs

Sunrise Point-LP is used on Skylake and KabyLake platforms,
but the PCH IDs differ.

This commit adds the PCH IDs for Skylake mobile platforms
and renames the Kabylake macros to distinguish them.

Used Intel documents:
- 332995-001EN (I/O datasheet vol. 1)

Change-Id: Id46224fcc44b06c91cbcd6c74a55c95e1de65ec6
Signed-off-by: Felix Singer 
---
M util/inteltool/gpio.c
M util/inteltool/gpio_groups.c
M util/inteltool/inteltool.c
M util/inteltool/inteltool.h
M util/inteltool/pcr.c
M util/inteltool/powermgt.c
M util/inteltool/rootcmplx.c
M util/inteltool/spi.c
8 files changed, 65 insertions(+), 33 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/31506/12

Change in ...coreboot[master]: inteltool: Add Sunrise Point-LP Skylake PCH IDs

[Felix Singer (Code Review)]

Hello Paul Menzel, Stefan Reinauer, build bot (Jenkins), Nico Huber,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/31506

to look at the new patch set (#13).

Change subject: inteltool: Add Sunrise Point-LP Skylake PCH IDs
......................................................................

inteltool: Add Sunrise Point-LP Skylake PCH IDs

Sunrise Point-LP is used on Skylake and KabyLake platforms,
but the PCH IDs differ.

This commit adds the PCH IDs for Skylake mobile platforms
and renames the Kabylake macros to distinguish them.

Used Intel documents:
- 332995-001EN (I/O datasheet vol. 1)
- 332996-002EN (I/O datasheet vol. 2)

Change-Id: Id46224fcc44b06c91cbcd6c74a55c95e1de65ec6
Signed-off-by: Felix Singer 
---
M util/inteltool/gpio.c
M util/inteltool/gpio_groups.c
M util/inteltool/inteltool.c
M util/inteltool/inteltool.h
M util/inteltool/pcr.c
M util/inteltool/powermgt.c
M util/inteltool/rootcmplx.c
M util/inteltool/spi.c
8 files changed, 73 insertions(+), 33 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/06/31506/13

Change in ...coreboot[master]: inteltool: Add Sunrise Point-LP Skylake PCH IDs

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31506 )

Change subject: inteltool: Add Sunrise Point-LP Skylake PCH IDs
......................................................................

Patch Set 13: Code-Review+2

Change in ...coreboot[master]: inteltool: Add Sunrise Point-LP Skylake PCH IDs

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31506 )

Change subject: inteltool: Add Sunrise Point-LP Skylake PCH IDs
......................................................................

inteltool: Add Sunrise Point-LP Skylake PCH IDs

Sunrise Point-LP is used on Skylake and KabyLake platforms,
but the PCH IDs differ.

This commit adds the PCH IDs for Skylake mobile platforms
and renames the Kabylake macros to distinguish them.

Used Intel documents:
- 332995-001EN (I/O datasheet vol. 1)
- 332996-002EN (I/O datasheet vol. 2)

Change-Id: Id46224fcc44b06c91cbcd6c74a55c95e1de65ec6
Signed-off-by: Felix Singer 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31506
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Rudolph 
---
M util/inteltool/gpio.c
M util/inteltool/gpio_groups.c
M util/inteltool/inteltool.c
M util/inteltool/inteltool.h
M util/inteltool/pcr.c
M util/inteltool/powermgt.c
M util/inteltool/rootcmplx.c
M util/inteltool/spi.c
8 files changed, 73 insertions(+), 33 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Rudolph: Looks good to me, approved

diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 41f4df9..c946d5c 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -1028,9 +1028,13 @@
    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 8b328a7..21e2de9 100644
--- a/util/inteltool/gpio_groups.c
+++ b/util/inteltool/gpio_groups.c
@@ -1778,9 +1778,13 @@
    	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 e89fd3c..40e7646 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -224,18 +224,26 @@
    { 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 25b3a15..6aec387 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -145,9 +145,13 @@
 #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 a296b19..c969620 100644
--- a/util/inteltool/pcr.c
+++ b/util/inteltool/pcr.c
@@ -79,9 +79,13 @@

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 3591800..675e31a 100644
--- a/util/inteltool/powermgt.c
+++ b/util/inteltool/powermgt.c
@@ -745,9 +745,13 @@
    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 ddcd8e3..70d7cbe 100644
--- a/util/inteltool/rootcmplx.c
+++ b/util/inteltool/rootcmplx.c
@@ -112,9 +112,13 @@
    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 cb38c55..da5533d 100644
--- a/util/inteltool/spi.c
+++ b/util/inteltool/spi.c
@@ -175,9 +175,13 @@
    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 @@
    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: