From 667d0f8966d5938a81c37202be7568fce42e2b81 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Thu, 11 Aug 2022 12:58:06 +0200 Subject: Fix Alder Lake and Raptor Lake Device ID's - ADP_P_* -> RPP_S_* (got mixed up I guess) - Remove duplicates of ADP_S_ESPI_* - Add infix _ESPI_ to all ADP_S device ID's Document: 619362 Change-Id: Ic18ecbd420fc598f0ef6e3cf38e987ac3ae6067e Signed-off-by: Maximilian Brune Reviewed-on: https://review.coreboot.org/c/coreboot/+/66629 Reviewed-by: Lean Sheng Tan Tested-by: build bot (Jenkins) --- src/include/device/pci_ids.h | 102 +++++++++------------ .../intel/alderlake/bootblock/report_platform.c | 84 +++++++++-------- src/soc/intel/common/block/lpc/lpc.c | 85 +++++++++-------- 3 files changed, 126 insertions(+), 145 deletions(-) (limited to 'src') diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index a8cbade924..fbc0293959 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -2976,57 +2976,57 @@ #define PCI_DID_INTEL_MCC_ESPI_3 0x4b06 #define PCI_DID_INTEL_MCC_ESPI_4 0x4b07 #define PCI_DID_INTEL_JSP_SUPER_ESPI 0x4d87 -#define PCI_DID_INTEL_ADP_P_ESPI_0 0x7a00 -#define PCI_DID_INTEL_ADP_P_ESPI_1 0x7a01 -#define PCI_DID_INTEL_ADP_P_ESPI_2 0x7a02 -#define PCI_DID_INTEL_ADP_P_ESPI_3 0x7a03 -#define PCI_DID_INTEL_ADP_P_ESPI_4 0x7a04 -#define PCI_DID_INTEL_ADP_P_ESPI_5 0x7a05 -#define PCI_DID_INTEL_ADP_P_ESPI_6 0x7a06 -#define PCI_DID_INTEL_ADP_P_ESPI_7 0x7a07 -#define PCI_DID_INTEL_ADP_P_ESPI_8 0x7a08 -#define PCI_DID_INTEL_ADP_P_ESPI_9 0x7a09 -#define PCI_DID_INTEL_ADP_P_ESPI_10 0x7a0a -#define PCI_DID_INTEL_ADP_P_ESPI_11 0x7a0b -#define PCI_DID_INTEL_ADP_P_ESPI_12 0x7a0c -#define PCI_DID_INTEL_ADP_P_ESPI_13 0x7a0d -#define PCI_DID_INTEL_ADP_P_ESPI_14 0x7a0e -#define PCI_DID_INTEL_ADP_P_ESPI_15 0x7a0f -#define PCI_DID_INTEL_ADP_P_ESPI_16 0x7a10 -#define PCI_DID_INTEL_ADP_P_ESPI_17 0x7a11 -#define PCI_DID_INTEL_ADP_P_ESPI_18 0x7a12 -#define PCI_DID_INTEL_ADP_P_ESPI_19 0x7a13 -#define PCI_DID_INTEL_ADP_P_ESPI_20 0x7a14 -#define PCI_DID_INTEL_ADP_P_ESPI_21 0x7a15 -#define PCI_DID_INTEL_ADP_P_ESPI_22 0x7a16 -#define PCI_DID_INTEL_ADP_P_ESPI_23 0x7a17 -#define PCI_DID_INTEL_ADP_P_ESPI_24 0x7a18 -#define PCI_DID_INTEL_ADP_P_ESPI_25 0x7a19 -#define PCI_DID_INTEL_ADP_P_ESPI_26 0x7a1a -#define PCI_DID_INTEL_ADP_P_ESPI_27 0x7a1b -#define PCI_DID_INTEL_ADP_P_ESPI_28 0x7a1c -#define PCI_DID_INTEL_ADP_P_ESPI_29 0x7a1d -#define PCI_DID_INTEL_ADP_P_ESPI_30 0x7a1e -#define PCI_DID_INTEL_ADP_P_ESPI_31 0x7a1f +#define PCI_DID_INTEL_RPP_S_ESPI_0 0x7a00 +#define PCI_DID_INTEL_RPP_S_ESPI_1 0x7a01 +#define PCI_DID_INTEL_RPP_S_ESPI_2 0x7a02 +#define PCI_DID_INTEL_RPP_S_ESPI_3 0x7a03 +#define PCI_DID_INTEL_RPP_S_ESPI_4 0x7a04 +#define PCI_DID_INTEL_RPP_S_ESPI_5 0x7a05 +#define PCI_DID_INTEL_RPP_S_ESPI_6 0x7a06 +#define PCI_DID_INTEL_RPP_S_ESPI_7 0x7a07 +#define PCI_DID_INTEL_RPP_S_ESPI_8 0x7a08 +#define PCI_DID_INTEL_RPP_S_ESPI_9 0x7a09 +#define PCI_DID_INTEL_RPP_S_ESPI_10 0x7a0a +#define PCI_DID_INTEL_RPP_S_ESPI_11 0x7a0b +#define PCI_DID_INTEL_RPP_S_ESPI_HM770 0x7a0c +#define PCI_DID_INTEL_RPP_S_ESPI_WM790 0x7a0d +#define PCI_DID_INTEL_RPP_S_ESPI_14 0x7a0e +#define PCI_DID_INTEL_RPP_S_ESPI_15 0x7a0f +#define PCI_DID_INTEL_RPP_S_ESPI_16 0x7a10 +#define PCI_DID_INTEL_RPP_S_ESPI_17 0x7a11 +#define PCI_DID_INTEL_RPP_S_ESPI_18 0x7a12 +#define PCI_DID_INTEL_RPP_S_ESPI_19 0x7a13 +#define PCI_DID_INTEL_RPP_S_ESPI_20 0x7a14 +#define PCI_DID_INTEL_RPP_S_ESPI_21 0x7a15 +#define PCI_DID_INTEL_RPP_S_ESPI_22 0x7a16 +#define PCI_DID_INTEL_RPP_S_ESPI_23 0x7a17 +#define PCI_DID_INTEL_RPP_S_ESPI_24 0x7a18 +#define PCI_DID_INTEL_RPP_S_ESPI_25 0x7a19 +#define PCI_DID_INTEL_RPP_S_ESPI_26 0x7a1a +#define PCI_DID_INTEL_RPP_S_ESPI_27 0x7a1b +#define PCI_DID_INTEL_RPP_S_ESPI_28 0x7a1c +#define PCI_DID_INTEL_RPP_S_ESPI_29 0x7a1d +#define PCI_DID_INTEL_RPP_S_ESPI_30 0x7a1e +#define PCI_DID_INTEL_RPP_S_ESPI_31 0x7a1f #define PCI_DID_INTEL_ADP_S_ESPI_0 0x7a80 #define PCI_DID_INTEL_ADP_S_ESPI_1 0x7a81 #define PCI_DID_INTEL_ADP_S_ESPI_2 0x7a82 -#define PCI_DID_INTEL_ADP_S_ESPI_3 0x7a83 -#define PCI_DID_INTEL_ADP_S_ESPI_4 0x7a84 -#define PCI_DID_INTEL_ADP_S_ESPI_5 0x7a85 -#define PCI_DID_INTEL_ADP_S_ESPI_6 0x7a86 -#define PCI_DID_INTEL_ADP_S_ESPI_7 0x7a87 -#define PCI_DID_INTEL_ADP_S_ESPI_8 0x7a88 +#define PCI_DID_INTEL_ADP_S_ESPI_Q670 0x7a83 +#define PCI_DID_INTEL_ADP_S_ESPI_Z690 0x7a84 +#define PCI_DID_INTEL_ADP_S_ESPI_H670 0x7a85 +#define PCI_DID_INTEL_ADP_S_ESPI_B660 0x7a86 +#define PCI_DID_INTEL_ADP_S_ESPI_H610 0x7a87 +#define PCI_DID_INTEL_ADP_S_ESPI_W680 0x7a88 #define PCI_DID_INTEL_ADP_S_ESPI_9 0x7a89 -#define PCI_DID_INTEL_ADP_S_ESPI_10 0x7a8a +#define PCI_DID_INTEL_ADP_S_ESPI_W685 0x7a8a #define PCI_DID_INTEL_ADP_S_ESPI_11 0x7a8b -#define PCI_DID_INTEL_ADP_S_ESPI_12 0x7a8c -#define PCI_DID_INTEL_ADP_S_ESPI_13 0x7a8d +#define PCI_DID_INTEL_ADP_S_ESPI_HM670 0x7a8c +#define PCI_DID_INTEL_ADP_S_ESPI_WM690 0x7a8d #define PCI_DID_INTEL_ADP_S_ESPI_14 0x7a8e #define PCI_DID_INTEL_ADP_S_ESPI_15 0x7a8f -#define PCI_DID_INTEL_ADP_S_ESPI_16 0x7a90 -#define PCI_DID_INTEL_ADP_S_ESPI_17 0x7a91 -#define PCI_DID_INTEL_ADP_S_ESPI_18 0x7a92 +#define PCI_DID_INTEL_ADP_S_ESPI_R680E 0x7a90 +#define PCI_DID_INTEL_ADP_S_ESPI_Q670E 0x7a91 +#define PCI_DID_INTEL_ADP_S_ESPI_H610E 0x7a92 #define PCI_DID_INTEL_ADP_S_ESPI_19 0x7a93 #define PCI_DID_INTEL_ADP_S_ESPI_20 0x7a94 #define PCI_DID_INTEL_ADP_S_ESPI_21 0x7a95 @@ -3040,20 +3040,6 @@ #define PCI_DID_INTEL_ADP_S_ESPI_29 0x7a9d #define PCI_DID_INTEL_ADP_S_ESPI_30 0x7a9e #define PCI_DID_INTEL_ADP_S_ESPI_31 0x7a9f -#define PCI_DID_INTEL_ADP_S_ESPI_H610E 0x7a92 -#define PCI_DID_INTEL_ADP_S_ESPI_Q670E 0x7a91 -#define PCI_DID_INTEL_ADP_S_ESPI_R680E 0x7a90 -#define PCI_DID_INTEL_ADP_S_H610 0x7a87 -#define PCI_DID_INTEL_ADP_S_B660 0x7a86 -#define PCI_DID_INTEL_ADP_S_H670 0x7a85 -#define PCI_DID_INTEL_ADP_S_Q670 0x7a83 -#define PCI_DID_INTEL_ADP_S_Z690 0x7a84 -#define PCI_DID_INTEL_ADP_S_W680 0x7a88 -#define PCI_DID_INTEL_ADP_S_W685 0x7a8a -#define PCI_DID_INTEL_ADP_S_WM690 0x7a8d -#define PCI_DID_INTEL_ADP_S_HM670 0x7a8c -#define PCI_DID_INTEL_ADP_S_WM790 0x7a0d -#define PCI_DID_INTEL_ADP_S_HM770 0x7a0c #define PCI_DID_INTEL_ADP_M_N_ESPI_0 0x5480 #define PCI_DID_INTEL_ADP_M_N_ESPI_1 0x5481 #define PCI_DID_INTEL_ADP_M_N_ESPI_2 0x5482 diff --git a/src/soc/intel/alderlake/bootblock/report_platform.c b/src/soc/intel/alderlake/bootblock/report_platform.c index 517f24279f..3c27ded892 100644 --- a/src/soc/intel/alderlake/bootblock/report_platform.c +++ b/src/soc/intel/alderlake/bootblock/report_platform.c @@ -81,54 +81,52 @@ static struct { u16 espiid; const char *name; } pch_table[] = { - { PCI_DID_INTEL_ADP_P_ESPI_0, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_1, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_2, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_3, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_4, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_5, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_6, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_7, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_8, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_9, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_10, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_11, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_12, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_13, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_14, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_15, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_16, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_17, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_18, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_19, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_20, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_21, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_22, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_23, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_24, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_25, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_26, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_27, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_28, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_29, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_30, "Alderlake-P SKU" }, - { PCI_DID_INTEL_ADP_P_ESPI_31, "Alderlake-P SKU" }, { PCI_DID_INTEL_ADP_M_N_ESPI_1, "Alderlake-N SKU" }, { PCI_DID_INTEL_ADP_M_N_ESPI_2, "Alderlake-N SKU" }, { PCI_DID_INTEL_ADP_S_ESPI_H610E, "AlderLake-S H610E" }, { PCI_DID_INTEL_ADP_S_ESPI_Q670E, "AlderLake-S Q670E" }, { PCI_DID_INTEL_ADP_S_ESPI_R680E, "AlderLake-S R680E" }, - { PCI_DID_INTEL_ADP_S_H610, "AlderLake-S H610" }, - { PCI_DID_INTEL_ADP_S_B660, "AlderLake-S B660" }, - { PCI_DID_INTEL_ADP_S_H670, "AlderLake-S H670" }, - { PCI_DID_INTEL_ADP_S_Q670, "AlderLake-S Q670" }, - { PCI_DID_INTEL_ADP_S_Z690, "AlderLake-S Z690" }, - { PCI_DID_INTEL_ADP_S_W680, "AlderLake-S W680" }, - { PCI_DID_INTEL_ADP_S_W685, "AlderLake-S W685" }, - { PCI_DID_INTEL_ADP_S_WM690, "AlderLake-S WM690" }, - { PCI_DID_INTEL_ADP_S_HM670, "AlderLake-S HM670" }, - { PCI_DID_INTEL_ADP_S_WM790, "AlderLake-S WM790" }, - { PCI_DID_INTEL_ADP_S_HM770, "AlderLake-S HM770" }, + { PCI_DID_INTEL_ADP_S_ESPI_H610, "AlderLake-S H610" }, + { PCI_DID_INTEL_ADP_S_ESPI_B660, "AlderLake-S B660" }, + { PCI_DID_INTEL_ADP_S_ESPI_H670, "AlderLake-S H670" }, + { PCI_DID_INTEL_ADP_S_ESPI_Q670, "AlderLake-S Q670" }, + { PCI_DID_INTEL_ADP_S_ESPI_Z690, "AlderLake-S Z690" }, + { PCI_DID_INTEL_ADP_S_ESPI_W680, "AlderLake-S W680" }, + { PCI_DID_INTEL_ADP_S_ESPI_W685, "AlderLake-S W685" }, + { PCI_DID_INTEL_ADP_S_ESPI_WM690, "AlderLake-S WM690" }, + { PCI_DID_INTEL_ADP_S_ESPI_HM670, "AlderLake-S HM670" }, + { PCI_DID_INTEL_RPP_S_ESPI_0, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_1, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_2, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_3, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_4, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_5, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_6, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_7, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_8, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_9, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_10, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_11, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_HM770, "Raptorlake-S HM770" }, + { PCI_DID_INTEL_RPP_S_ESPI_WM790, "Raptorlake-S WM790" }, + { PCI_DID_INTEL_RPP_S_ESPI_14, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_15, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_16, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_17, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_18, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_19, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_20, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_21, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_22, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_23, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_24, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_25, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_26, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_27, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_28, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_29, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_30, "Raptorlake-S SKU" }, + { PCI_DID_INTEL_RPP_S_ESPI_31, "Raptorlake-S SKU" }, { PCI_DID_INTEL_RPP_P_ESPI_0, "Raptorlake-P SKU" }, { PCI_DID_INTEL_RPP_P_ADP_P_ESPI_1, "Raptorlake-P SKU" }, { PCI_DID_INTEL_RPP_P_ADP_P_ESPI_2, "Raptorlake-P SKU" }, diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c index 55437ba24d..fbae2f0ee2 100644 --- a/src/soc/intel/common/block/lpc/lpc.c +++ b/src/soc/intel/common/block/lpc/lpc.c @@ -178,6 +178,38 @@ static const unsigned short pci_device_ids[] = { PCI_DID_INTEL_RPP_P_ESPI_29, PCI_DID_INTEL_RPP_P_ESPI_30, PCI_DID_INTEL_RPP_P_ESPI_31, + PCI_DID_INTEL_RPP_S_ESPI_0, + PCI_DID_INTEL_RPP_S_ESPI_1, + PCI_DID_INTEL_RPP_S_ESPI_2, + PCI_DID_INTEL_RPP_S_ESPI_3, + PCI_DID_INTEL_RPP_S_ESPI_4, + PCI_DID_INTEL_RPP_S_ESPI_5, + PCI_DID_INTEL_RPP_S_ESPI_6, + PCI_DID_INTEL_RPP_S_ESPI_7, + PCI_DID_INTEL_RPP_S_ESPI_8, + PCI_DID_INTEL_RPP_S_ESPI_9, + PCI_DID_INTEL_RPP_S_ESPI_10, + PCI_DID_INTEL_RPP_S_ESPI_11, + PCI_DID_INTEL_RPP_S_ESPI_HM770, + PCI_DID_INTEL_RPP_S_ESPI_WM790, + PCI_DID_INTEL_RPP_S_ESPI_14, + PCI_DID_INTEL_RPP_S_ESPI_15, + PCI_DID_INTEL_RPP_S_ESPI_16, + PCI_DID_INTEL_RPP_S_ESPI_17, + PCI_DID_INTEL_RPP_S_ESPI_18, + PCI_DID_INTEL_RPP_S_ESPI_19, + PCI_DID_INTEL_RPP_S_ESPI_20, + PCI_DID_INTEL_RPP_S_ESPI_21, + PCI_DID_INTEL_RPP_S_ESPI_22, + PCI_DID_INTEL_RPP_S_ESPI_23, + PCI_DID_INTEL_RPP_S_ESPI_24, + PCI_DID_INTEL_RPP_S_ESPI_25, + PCI_DID_INTEL_RPP_S_ESPI_26, + PCI_DID_INTEL_RPP_S_ESPI_27, + PCI_DID_INTEL_RPP_S_ESPI_28, + PCI_DID_INTEL_RPP_S_ESPI_29, + PCI_DID_INTEL_RPP_S_ESPI_30, + PCI_DID_INTEL_RPP_S_ESPI_31, PCI_DID_INTEL_SPT_LP_SAMPLE, PCI_DID_INTEL_SPT_LP_U_BASE, PCI_DID_INTEL_SPT_LP_U_PREMIUM, @@ -316,57 +348,22 @@ static const unsigned short pci_device_ids[] = { PCI_DID_INTEL_MCC_ESPI_3, PCI_DID_INTEL_MCC_ESPI_4, PCI_DID_INTEL_JSP_SUPER_ESPI, - PCI_DID_INTEL_ADP_P_ESPI_0, - PCI_DID_INTEL_ADP_P_ESPI_1, - PCI_DID_INTEL_ADP_P_ESPI_2, - PCI_DID_INTEL_ADP_P_ESPI_3, - PCI_DID_INTEL_ADP_P_ESPI_4, - PCI_DID_INTEL_ADP_P_ESPI_5, - PCI_DID_INTEL_ADP_P_ESPI_6, - PCI_DID_INTEL_ADP_P_ESPI_7, - PCI_DID_INTEL_ADP_P_ESPI_8, - PCI_DID_INTEL_ADP_P_ESPI_9, - PCI_DID_INTEL_ADP_P_ESPI_10, - PCI_DID_INTEL_ADP_P_ESPI_11, - PCI_DID_INTEL_ADP_P_ESPI_12, - PCI_DID_INTEL_ADP_P_ESPI_13, - PCI_DID_INTEL_ADP_P_ESPI_14, - PCI_DID_INTEL_ADP_P_ESPI_15, - PCI_DID_INTEL_ADP_P_ESPI_16, - PCI_DID_INTEL_ADP_P_ESPI_17, - PCI_DID_INTEL_ADP_P_ESPI_18, - PCI_DID_INTEL_ADP_P_ESPI_19, - PCI_DID_INTEL_ADP_P_ESPI_20, - PCI_DID_INTEL_ADP_P_ESPI_21, - PCI_DID_INTEL_ADP_P_ESPI_22, - PCI_DID_INTEL_ADP_P_ESPI_23, - PCI_DID_INTEL_ADP_P_ESPI_24, - PCI_DID_INTEL_ADP_P_ESPI_25, - PCI_DID_INTEL_ADP_P_ESPI_26, - PCI_DID_INTEL_ADP_P_ESPI_27, - PCI_DID_INTEL_ADP_P_ESPI_28, - PCI_DID_INTEL_ADP_P_ESPI_29, - PCI_DID_INTEL_ADP_P_ESPI_30, - PCI_DID_INTEL_ADP_P_ESPI_31, + PCI_DID_INTEL_ADP_S_ESPI_WM690, + PCI_DID_INTEL_ADP_S_ESPI_HM670, + PCI_DID_INTEL_ADP_S_ESPI_W685, + PCI_DID_INTEL_ADP_S_ESPI_W680, + PCI_DID_INTEL_ADP_S_ESPI_H610, + PCI_DID_INTEL_ADP_S_ESPI_B660, + PCI_DID_INTEL_ADP_S_ESPI_H670, + PCI_DID_INTEL_ADP_S_ESPI_Z690, + PCI_DID_INTEL_ADP_S_ESPI_Q670, PCI_DID_INTEL_ADP_S_ESPI_0, PCI_DID_INTEL_ADP_S_ESPI_1, PCI_DID_INTEL_ADP_S_ESPI_2, - PCI_DID_INTEL_ADP_S_ESPI_3, - PCI_DID_INTEL_ADP_S_ESPI_4, - PCI_DID_INTEL_ADP_S_ESPI_5, - PCI_DID_INTEL_ADP_S_ESPI_6, - PCI_DID_INTEL_ADP_S_ESPI_7, - PCI_DID_INTEL_ADP_S_ESPI_8, PCI_DID_INTEL_ADP_S_ESPI_9, - PCI_DID_INTEL_ADP_S_ESPI_10, PCI_DID_INTEL_ADP_S_ESPI_11, - PCI_DID_INTEL_ADP_S_ESPI_12, - PCI_DID_INTEL_ADP_S_ESPI_13, PCI_DID_INTEL_ADP_S_ESPI_14, PCI_DID_INTEL_ADP_S_ESPI_15, - PCI_DID_INTEL_ADP_S_ESPI_16, - PCI_DID_INTEL_ADP_S_ESPI_17, - PCI_DID_INTEL_ADP_S_ESPI_18, PCI_DID_INTEL_ADP_S_ESPI_19, PCI_DID_INTEL_ADP_S_ESPI_20, PCI_DID_INTEL_ADP_S_ESPI_21, -- cgit v1.2.3