3 files changed, 38 insertions, 14 deletions
diff --git a/src/southbridge/intel/lynxpoint/early_pch.c b/src/southbridge/intel/lynxpoint/early_pch.c
index 92cbf0176f..80b8939c5a 100644
--- a/src/southbridge/intel/lynxpoint/early_pch.c
+++ b/src/southbridge/intel/lynxpoint/early_pch.c
@@ -18,10 +18,25 @@ extern const struct pch_lp_gpio_map mainboard_gpio_map[];
 #include <southbridge/intel/common/gpio.h>
 #endif
 
+enum pch_platform_type get_pch_platform_type(void)
+{
+	const u16 did = pci_read_config16(PCH_LPC_DEV, PCI_DEVICE_ID);
+
+	/* Check if this is a LPT-LP or WPT-LP device ID */
+	if ((did & 0xff00) == 0x9c00)
+		return PCH_TYPE_ULT;
+
+	/* Non-LP laptop SKUs have an odd device ID (least significant bit is one) */
+	if (did & 1)
+		return PCH_TYPE_MOBILE;
+
+	/* Desktop and Server SKUs have an even device ID */
+	return PCH_TYPE_DESKTOP;
+}
+
 int pch_is_lp(void)
 {
-	u8 id = pci_read_config8(PCH_LPC_DEV, PCI_DEVICE_ID + 1);
-	return id == PCH_TYPE_LPT_LP;
+	return get_pch_platform_type() == PCH_TYPE_ULT;
 }
 
 static void pch_enable_bars(void)
diff --git a/src/southbridge/intel/lynxpoint/pch.c b/src/southbridge/intel/lynxpoint/pch.c
index e3c5bb2ef0..0a0e489d6f 100644
--- a/src/southbridge/intel/lynxpoint/pch.c
+++ b/src/southbridge/intel/lynxpoint/pch.c
@@ -40,19 +40,25 @@ int pch_silicon_id(void)
 	return pch_id;
 }
 
-int pch_silicon_type(void)
+enum pch_platform_type get_pch_platform_type(void)
 {
-	static int pch_type = -1;
+	const u16 did = pci_read_config16(pch_get_lpc_device(), PCI_DEVICE_ID);
 
-	if (pch_type < 0)
-		pch_type = pci_read_config8(pch_get_lpc_device(),
-					    PCI_DEVICE_ID + 1);
-	return pch_type;
+	/* Check if this is a LPT-LP or WPT-LP device ID */
+	if ((did & 0xff00) == 0x9c00)
+		return PCH_TYPE_ULT;
+
+	/* Non-LP laptop SKUs have an odd device ID (least significant bit is one) */
+	if (did & 1)
+		return PCH_TYPE_MOBILE;
+
+	/* Desktop and Server SKUs have an even device ID */
+	return PCH_TYPE_DESKTOP;
 }
 
 int pch_is_lp(void)
 {
-	return pch_silicon_type() == PCH_TYPE_LPT_LP;
+	return get_pch_platform_type() == PCH_TYPE_ULT;
 }
 
 u16 get_pmbase(void)
diff --git a/src/southbridge/intel/lynxpoint/pch.h b/src/southbridge/intel/lynxpoint/pch.h
index c59878e48e..896454fc08 100644
--- a/src/southbridge/intel/lynxpoint/pch.h
+++ b/src/southbridge/intel/lynxpoint/pch.h
@@ -34,10 +34,6 @@
  * Bus 0:Device 20:Function 0 xHCI Controller
 */
 
-/* PCH types */
-#define PCH_TYPE_LPT		0x8c
-#define PCH_TYPE_LPT_LP		0x9c
-
 /* PCH stepping values for LPC device */
 #define LPT_H_STEP_B0		0x02
 #define LPT_H_STEP_C0		0x03
@@ -74,14 +70,21 @@
 
 #ifndef __ACPI__
 
+/* PCH platform types, safe for MRC consumption */
+enum pch_platform_type {
+	PCH_TYPE_MOBILE	 = 0,
+	PCH_TYPE_DESKTOP = 1, /* or server */
+	PCH_TYPE_ULT	 = 5,
+};
+
 void usb_ehci_sleep_prepare(pci_devfn_t dev, u8 slp_typ);
 void usb_ehci_disable(pci_devfn_t dev);
 void usb_xhci_sleep_prepare(pci_devfn_t dev, u8 slp_typ);
 void usb_xhci_route_all(void);
 
+enum pch_platform_type get_pch_platform_type(void);
 int pch_silicon_revision(void);
 int pch_silicon_id(void);
-int pch_silicon_type(void);
 int pch_is_lp(void);
 u16 get_pmbase(void);
 u16 get_gpiobase(void);