diff options
Diffstat (limited to 'src/soc/intel/common/block')
25 files changed, 1392 insertions, 1392 deletions
diff --git a/src/soc/intel/common/block/cnvi/cnvi.c b/src/soc/intel/common/block/cnvi/cnvi.c index 8ce313586b..fd0c33de4a 100644 --- a/src/soc/intel/common/block/cnvi/cnvi.c +++ b/src/soc/intel/common/block/cnvi/cnvi.c @@ -21,34 +21,34 @@ static struct device_operations cnvi_wifi_ops = { }; static const unsigned short wifi_pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_CML_LP_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_CML_H_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_CNL_LP_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_CNL_H_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_GLK_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_ICL_CNVI_WIFI, - PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_0, - PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_1, - PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_2, - PCI_DEVICE_ID_INTEL_JSL_CNVI_WIFI_3, - PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_0, - PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_1, - PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_2, - PCI_DEVICE_ID_INTEL_TGL_CNVI_WIFI_3, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_0, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_1, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_2, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_WIFI_3, - PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_0, - PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_1, - PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_2, - PCI_DEVICE_ID_INTEL_ADL_N_CNVI_WIFI_3, + PCI_DID_INTEL_CML_LP_CNVI_WIFI, + PCI_DID_INTEL_CML_H_CNVI_WIFI, + PCI_DID_INTEL_CNL_LP_CNVI_WIFI, + PCI_DID_INTEL_CNL_H_CNVI_WIFI, + PCI_DID_INTEL_GLK_CNVI_WIFI, + PCI_DID_INTEL_ICL_CNVI_WIFI, + PCI_DID_INTEL_JSL_CNVI_WIFI_0, + PCI_DID_INTEL_JSL_CNVI_WIFI_1, + PCI_DID_INTEL_JSL_CNVI_WIFI_2, + PCI_DID_INTEL_JSL_CNVI_WIFI_3, + PCI_DID_INTEL_TGL_CNVI_WIFI_0, + PCI_DID_INTEL_TGL_CNVI_WIFI_1, + PCI_DID_INTEL_TGL_CNVI_WIFI_2, + PCI_DID_INTEL_TGL_CNVI_WIFI_3, + PCI_DID_INTEL_TGL_H_CNVI_WIFI_0, + PCI_DID_INTEL_TGL_H_CNVI_WIFI_1, + PCI_DID_INTEL_TGL_H_CNVI_WIFI_2, + PCI_DID_INTEL_TGL_H_CNVI_WIFI_3, + PCI_DID_INTEL_ADL_N_CNVI_WIFI_0, + PCI_DID_INTEL_ADL_N_CNVI_WIFI_1, + PCI_DID_INTEL_ADL_N_CNVI_WIFI_2, + PCI_DID_INTEL_ADL_N_CNVI_WIFI_3, 0 }; static const struct pci_driver pch_cnvi_wifi __pci_driver = { .ops = &cnvi_wifi_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = wifi_pci_device_ids, }; @@ -68,18 +68,18 @@ static struct device_operations cnvi_bt_ops = { }; static const unsigned short bt_pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_0, - PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_1, - PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_2, - PCI_DEVICE_ID_INTEL_TGL_CNVI_BT_3, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_0, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_1, - PCI_DEVICE_ID_INTEL_TGL_H_CNVI_BT_2, + PCI_DID_INTEL_TGL_CNVI_BT_0, + PCI_DID_INTEL_TGL_CNVI_BT_1, + PCI_DID_INTEL_TGL_CNVI_BT_2, + PCI_DID_INTEL_TGL_CNVI_BT_3, + PCI_DID_INTEL_TGL_H_CNVI_BT_0, + PCI_DID_INTEL_TGL_H_CNVI_BT_1, + PCI_DID_INTEL_TGL_H_CNVI_BT_2, 0 }; static const struct pci_driver pch_cnvi_bt __pci_driver = { .ops = &cnvi_bt_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = bt_pci_device_ids, }; diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c index 19d733602e..b0b2c5adaf 100644 --- a/src/soc/intel/common/block/cse/cse.c +++ b/src/soc/intel/common/block/cse/cse.c @@ -1257,44 +1257,44 @@ static struct device_operations cse_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_CSE0, - PCI_DEVICE_ID_INTEL_GLK_CSE0, - PCI_DEVICE_ID_INTEL_CNL_CSE0, - PCI_DEVICE_ID_INTEL_SKL_CSE0, - PCI_DEVICE_ID_INTEL_LWB_CSE0, - PCI_DEVICE_ID_INTEL_LWB_CSE0_SUPER, - PCI_DEVICE_ID_INTEL_CNP_H_CSE0, - PCI_DEVICE_ID_INTEL_ICL_CSE0, - PCI_DEVICE_ID_INTEL_CMP_CSE0, - PCI_DEVICE_ID_INTEL_CMP_H_CSE0, - PCI_DEVICE_ID_INTEL_TGL_CSE0, - PCI_DEVICE_ID_INTEL_TGL_H_CSE0, - PCI_DEVICE_ID_INTEL_MCC_CSE0, - PCI_DEVICE_ID_INTEL_MCC_CSE1, - PCI_DEVICE_ID_INTEL_MCC_CSE2, - PCI_DEVICE_ID_INTEL_MCC_CSE3, - PCI_DEVICE_ID_INTEL_JSP_CSE0, - PCI_DEVICE_ID_INTEL_JSP_CSE1, - PCI_DEVICE_ID_INTEL_JSP_CSE2, - PCI_DEVICE_ID_INTEL_JSP_CSE3, - PCI_DEVICE_ID_INTEL_ADP_P_CSE0, - PCI_DEVICE_ID_INTEL_ADP_P_CSE1, - PCI_DEVICE_ID_INTEL_ADP_P_CSE2, - PCI_DEVICE_ID_INTEL_ADP_P_CSE3, - PCI_DEVICE_ID_INTEL_ADP_S_CSE0, - PCI_DEVICE_ID_INTEL_ADP_S_CSE1, - PCI_DEVICE_ID_INTEL_ADP_S_CSE2, - PCI_DEVICE_ID_INTEL_ADP_S_CSE3, - PCI_DEVICE_ID_INTEL_ADP_M_CSE0, - PCI_DEVICE_ID_INTEL_ADP_M_CSE1, - PCI_DEVICE_ID_INTEL_ADP_M_CSE2, - PCI_DEVICE_ID_INTEL_ADP_M_CSE3, + PCI_DID_INTEL_APL_CSE0, + PCI_DID_INTEL_GLK_CSE0, + PCI_DID_INTEL_CNL_CSE0, + PCI_DID_INTEL_SKL_CSE0, + PCI_DID_INTEL_LWB_CSE0, + PCI_DID_INTEL_LWB_CSE0_SUPER, + PCI_DID_INTEL_CNP_H_CSE0, + PCI_DID_INTEL_ICL_CSE0, + PCI_DID_INTEL_CMP_CSE0, + PCI_DID_INTEL_CMP_H_CSE0, + PCI_DID_INTEL_TGL_CSE0, + PCI_DID_INTEL_TGL_H_CSE0, + PCI_DID_INTEL_MCC_CSE0, + PCI_DID_INTEL_MCC_CSE1, + PCI_DID_INTEL_MCC_CSE2, + PCI_DID_INTEL_MCC_CSE3, + PCI_DID_INTEL_JSP_CSE0, + PCI_DID_INTEL_JSP_CSE1, + PCI_DID_INTEL_JSP_CSE2, + PCI_DID_INTEL_JSP_CSE3, + PCI_DID_INTEL_ADP_P_CSE0, + PCI_DID_INTEL_ADP_P_CSE1, + PCI_DID_INTEL_ADP_P_CSE2, + PCI_DID_INTEL_ADP_P_CSE3, + PCI_DID_INTEL_ADP_S_CSE0, + PCI_DID_INTEL_ADP_S_CSE1, + PCI_DID_INTEL_ADP_S_CSE2, + PCI_DID_INTEL_ADP_S_CSE3, + PCI_DID_INTEL_ADP_M_CSE0, + PCI_DID_INTEL_ADP_M_CSE1, + PCI_DID_INTEL_ADP_M_CSE2, + PCI_DID_INTEL_ADP_M_CSE3, 0, }; static const struct pci_driver cse_driver __pci_driver = { .ops = &cse_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, /* SoC/chipset needs to provide PCI device ID */ .devices = pci_device_ids }; diff --git a/src/soc/intel/common/block/dsp/dsp.c b/src/soc/intel/common/block/dsp/dsp.c index 35e167054a..102ec60594 100644 --- a/src/soc/intel/common/block/dsp/dsp.c +++ b/src/soc/intel/common/block/dsp/dsp.c @@ -13,39 +13,39 @@ static struct device_operations dsp_dev_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_AUDIO, - PCI_DEVICE_ID_INTEL_CNL_AUDIO, - PCI_DEVICE_ID_INTEL_GLK_AUDIO, - PCI_DEVICE_ID_INTEL_SKL_AUDIO, - PCI_DEVICE_ID_INTEL_CNP_H_AUDIO, - PCI_DEVICE_ID_INTEL_CMP_AUDIO, - PCI_DEVICE_ID_INTEL_CMP_H_AUDIO, - PCI_DEVICE_ID_INTEL_ICL_AUDIO, - PCI_DEVICE_ID_INTEL_TGL_AUDIO, - PCI_DEVICE_ID_INTEL_TGL_H_AUDIO, - PCI_DEVICE_ID_INTEL_MCC_AUDIO, - PCI_DEVICE_ID_INTEL_JSP_AUDIO, - PCI_DEVICE_ID_INTEL_ADP_P_AUDIO, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_1, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_2, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_3, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_4, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_5, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_6, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_7, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_8, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_1, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_2, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_3, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_4, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_5, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_6, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_7, + PCI_DID_INTEL_APL_AUDIO, + PCI_DID_INTEL_CNL_AUDIO, + PCI_DID_INTEL_GLK_AUDIO, + PCI_DID_INTEL_SKL_AUDIO, + PCI_DID_INTEL_CNP_H_AUDIO, + PCI_DID_INTEL_CMP_AUDIO, + PCI_DID_INTEL_CMP_H_AUDIO, + PCI_DID_INTEL_ICL_AUDIO, + PCI_DID_INTEL_TGL_AUDIO, + PCI_DID_INTEL_TGL_H_AUDIO, + PCI_DID_INTEL_MCC_AUDIO, + PCI_DID_INTEL_JSP_AUDIO, + PCI_DID_INTEL_ADP_P_AUDIO, + PCI_DID_INTEL_ADP_S_AUDIO_1, + PCI_DID_INTEL_ADP_S_AUDIO_2, + PCI_DID_INTEL_ADP_S_AUDIO_3, + PCI_DID_INTEL_ADP_S_AUDIO_4, + PCI_DID_INTEL_ADP_S_AUDIO_5, + PCI_DID_INTEL_ADP_S_AUDIO_6, + PCI_DID_INTEL_ADP_S_AUDIO_7, + PCI_DID_INTEL_ADP_S_AUDIO_8, + PCI_DID_INTEL_ADP_M_N_AUDIO_1, + PCI_DID_INTEL_ADP_M_N_AUDIO_2, + PCI_DID_INTEL_ADP_M_N_AUDIO_3, + PCI_DID_INTEL_ADP_M_N_AUDIO_4, + PCI_DID_INTEL_ADP_M_N_AUDIO_5, + PCI_DID_INTEL_ADP_M_N_AUDIO_6, + PCI_DID_INTEL_ADP_M_N_AUDIO_7, 0, }; static const struct pci_driver dsp_driver __pci_driver = { .ops = &dsp_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/dtt/dtt.c b/src/soc/intel/common/block/dtt/dtt.c index 58afd744f2..e15e302956 100644 --- a/src/soc/intel/common/block/dtt/dtt.c +++ b/src/soc/intel/common/block/dtt/dtt.c @@ -5,10 +5,10 @@ #include <device/pci_ids.h> static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_CML_DTT, - PCI_DEVICE_ID_INTEL_TGL_DTT, - PCI_DEVICE_ID_INTEL_JSL_DTT, - PCI_DEVICE_ID_INTEL_ADL_DTT, + PCI_DID_INTEL_CML_DTT, + PCI_DID_INTEL_TGL_DTT, + PCI_DID_INTEL_JSL_DTT, + PCI_DID_INTEL_ADL_DTT, 0 }; @@ -22,6 +22,6 @@ static struct device_operations dptf_dev_ops = { static const struct pci_driver pch_dptf __pci_driver = { .ops = &dptf_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c index 6118f9960f..84e800db6f 100644 --- a/src/soc/intel/common/block/graphics/graphics.c +++ b/src/soc/intel/common/block/graphics/graphics.c @@ -177,150 +177,150 @@ static const struct device_operations graphics_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_IGD_HD_505, - PCI_DEVICE_ID_INTEL_APL_IGD_HD_500, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_1, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_2, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_3, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_4, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_1, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_2, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_3, - PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_4, - PCI_DEVICE_ID_INTEL_GLK_IGD, - PCI_DEVICE_ID_INTEL_GLK_IGD_EU12, - PCI_DEVICE_ID_INTEL_WHL_GT1_ULT_1, - PCI_DEVICE_ID_INTEL_WHL_GT2_ULT_1, - PCI_DEVICE_ID_INTEL_KBL_GT1_SULTM, - PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_1, - PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_2, - PCI_DEVICE_ID_INTEL_KBL_GT1_SSRVM, - PCI_DEVICE_ID_INTEL_KBL_GT1F_DT2, - PCI_DEVICE_ID_INTEL_KBL_GT2_SULXM, - PCI_DEVICE_ID_INTEL_KBL_GT2_SULTM, - PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR, - PCI_DEVICE_ID_INTEL_KBL_GT2_SSRVM, - PCI_DEVICE_ID_INTEL_KBL_GT2_SWSTM, - PCI_DEVICE_ID_INTEL_KBL_GT2_SHALM, - PCI_DEVICE_ID_INTEL_KBL_GT2_DT2P2, - PCI_DEVICE_ID_INTEL_KBL_GT2F_SULTM, - PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_1, - PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_2, - PCI_DEVICE_ID_INTEL_KBL_GT4_SHALM, - PCI_DEVICE_ID_INTEL_AML_GT2_ULX, - PCI_DEVICE_ID_INTEL_SKL_GT1F_DT2, - PCI_DEVICE_ID_INTEL_SKL_GT1_SULTM, - PCI_DEVICE_ID_INTEL_SKL_GT2_DT2P1, - PCI_DEVICE_ID_INTEL_SKL_GT2_SULXM, - PCI_DEVICE_ID_INTEL_SKL_GT2_SULTM, - PCI_DEVICE_ID_INTEL_SKL_GT2_SHALM, - PCI_DEVICE_ID_INTEL_SKL_GT2_SWKSM, - PCI_DEVICE_ID_INTEL_SKL_GT3_SULTM, - PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_1, - PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_2, - PCI_DEVICE_ID_INTEL_SKL_GT3FE_SSRVM, - PCI_DEVICE_ID_INTEL_SKL_GT4_SHALM, - PCI_DEVICE_ID_INTEL_SKL_GT4E_SWSTM, - PCI_DEVICE_ID_INTEL_CFL_H_GT2, - PCI_DEVICE_ID_INTEL_CFL_H_XEON_GT2, - PCI_DEVICE_ID_INTEL_CFL_S_GT1_1, - PCI_DEVICE_ID_INTEL_CFL_S_GT1_2, - PCI_DEVICE_ID_INTEL_CFL_S_GT2_1, - PCI_DEVICE_ID_INTEL_CFL_S_GT2_2, - PCI_DEVICE_ID_INTEL_CFL_S_GT2_3, - PCI_DEVICE_ID_INTEL_CFL_S_GT2_4, - PCI_DEVICE_ID_INTEL_CFL_S_GT2_5, - PCI_DEVICE_ID_INTEL_ICL_GT0_ULT, - PCI_DEVICE_ID_INTEL_ICL_GT0_5_ULT, - PCI_DEVICE_ID_INTEL_ICL_GT1_ULT, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_0, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_1, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_1, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_2, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_2, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_3, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_3, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_4, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_4, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_5, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_5, - PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_6, - PCI_DEVICE_ID_INTEL_ICL_GT3_ULT, - PCI_DEVICE_ID_INTEL_CML_GT1_ULT_1, - PCI_DEVICE_ID_INTEL_CML_GT1_ULT_2, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_1, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_2, - PCI_DEVICE_ID_INTEL_CML_GT1_ULT_3, - PCI_DEVICE_ID_INTEL_CML_GT1_ULT_4, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_5, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_6, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_3, - PCI_DEVICE_ID_INTEL_CML_GT2_ULT_4, - PCI_DEVICE_ID_INTEL_CML_GT1_ULX_1, - PCI_DEVICE_ID_INTEL_CML_GT2_ULX_1, - PCI_DEVICE_ID_INTEL_CML_GT1_S_1, - PCI_DEVICE_ID_INTEL_CML_GT1_S_2, - PCI_DEVICE_ID_INTEL_CML_GT2_S_1, - PCI_DEVICE_ID_INTEL_CML_GT2_S_2, - PCI_DEVICE_ID_INTEL_CML_GT1_H_1, - PCI_DEVICE_ID_INTEL_CML_GT1_H_2, - PCI_DEVICE_ID_INTEL_CML_GT2_H_1, - PCI_DEVICE_ID_INTEL_CML_GT2_H_2, - PCI_DEVICE_ID_INTEL_CML_GT2_S_G0, - PCI_DEVICE_ID_INTEL_CML_GT2_S_P0, - PCI_DEVICE_ID_INTEL_CML_GT2_H_R0, - PCI_DEVICE_ID_INTEL_CML_GT2_H_R1, - PCI_DEVICE_ID_INTEL_TGL_GT0, - PCI_DEVICE_ID_INTEL_TGL_GT1_H_32, - PCI_DEVICE_ID_INTEL_TGL_GT1_H_16, - PCI_DEVICE_ID_INTEL_TGL_GT2_ULT, - PCI_DEVICE_ID_INTEL_TGL_GT2_ULX, - PCI_DEVICE_ID_INTEL_TGL_GT3_ULT, - PCI_DEVICE_ID_INTEL_TGL_GT2_ULT_1, - PCI_DEVICE_ID_INTEL_EHL_GT1_1, - PCI_DEVICE_ID_INTEL_EHL_GT2_1, - PCI_DEVICE_ID_INTEL_EHL_GT1_2, - PCI_DEVICE_ID_INTEL_EHL_GT2_2, - PCI_DEVICE_ID_INTEL_EHL_GT1_2_1, - PCI_DEVICE_ID_INTEL_EHL_GT1_3, - PCI_DEVICE_ID_INTEL_EHL_GT2_3, - PCI_DEVICE_ID_INTEL_JSL_GT1, - PCI_DEVICE_ID_INTEL_JSL_GT2, - PCI_DEVICE_ID_INTEL_JSL_GT3, - PCI_DEVICE_ID_INTEL_JSL_GT4, - PCI_DEVICE_ID_INTEL_ADL_GT0, - PCI_DEVICE_ID_INTEL_ADL_GT1, - PCI_DEVICE_ID_INTEL_ADL_GT1_1, - PCI_DEVICE_ID_INTEL_ADL_GT1_2, - PCI_DEVICE_ID_INTEL_ADL_GT1_3, - PCI_DEVICE_ID_INTEL_ADL_GT1_4, - PCI_DEVICE_ID_INTEL_ADL_GT1_5, - PCI_DEVICE_ID_INTEL_ADL_GT1_6, - PCI_DEVICE_ID_INTEL_ADL_GT1_7, - PCI_DEVICE_ID_INTEL_ADL_GT1_8, - PCI_DEVICE_ID_INTEL_ADL_GT1_9, - PCI_DEVICE_ID_INTEL_ADL_P_GT2, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_1, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_2, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_3, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_4, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_5, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_6, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_7, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_8, - PCI_DEVICE_ID_INTEL_ADL_P_GT2_9, - PCI_DEVICE_ID_INTEL_ADL_S_GT1, - PCI_DEVICE_ID_INTEL_ADL_M_GT1, - PCI_DEVICE_ID_INTEL_ADL_M_GT2, - PCI_DEVICE_ID_INTEL_ADL_M_GT3, - PCI_DEVICE_ID_INTEL_ADL_N_GT1, - PCI_DEVICE_ID_INTEL_ADL_N_GT2, - PCI_DEVICE_ID_INTEL_ADL_N_GT3, + PCI_DID_INTEL_APL_IGD_HD_505, + PCI_DID_INTEL_APL_IGD_HD_500, + PCI_DID_INTEL_CNL_GT2_ULX_1, + PCI_DID_INTEL_CNL_GT2_ULX_2, + PCI_DID_INTEL_CNL_GT2_ULX_3, + PCI_DID_INTEL_CNL_GT2_ULX_4, + PCI_DID_INTEL_CNL_GT2_ULT_1, + PCI_DID_INTEL_CNL_GT2_ULT_2, + PCI_DID_INTEL_CNL_GT2_ULT_3, + PCI_DID_INTEL_CNL_GT2_ULT_4, + PCI_DID_INTEL_GLK_IGD, + PCI_DID_INTEL_GLK_IGD_EU12, + PCI_DID_INTEL_WHL_GT1_ULT_1, + PCI_DID_INTEL_WHL_GT2_ULT_1, + PCI_DID_INTEL_KBL_GT1_SULTM, + PCI_DID_INTEL_KBL_GT1_SHALM_1, + PCI_DID_INTEL_KBL_GT1_SHALM_2, + PCI_DID_INTEL_KBL_GT1_SSRVM, + PCI_DID_INTEL_KBL_GT1F_DT2, + PCI_DID_INTEL_KBL_GT2_SULXM, + PCI_DID_INTEL_KBL_GT2_SULTM, + PCI_DID_INTEL_KBL_GT2_SULTMR, + PCI_DID_INTEL_KBL_GT2_SSRVM, + PCI_DID_INTEL_KBL_GT2_SWSTM, + PCI_DID_INTEL_KBL_GT2_SHALM, + PCI_DID_INTEL_KBL_GT2_DT2P2, + PCI_DID_INTEL_KBL_GT2F_SULTM, + PCI_DID_INTEL_KBL_GT3E_SULTM_1, + PCI_DID_INTEL_KBL_GT3E_SULTM_2, + PCI_DID_INTEL_KBL_GT4_SHALM, + PCI_DID_INTEL_AML_GT2_ULX, + PCI_DID_INTEL_SKL_GT1F_DT2, + PCI_DID_INTEL_SKL_GT1_SULTM, + PCI_DID_INTEL_SKL_GT2_DT2P1, + PCI_DID_INTEL_SKL_GT2_SULXM, + PCI_DID_INTEL_SKL_GT2_SULTM, + PCI_DID_INTEL_SKL_GT2_SHALM, + PCI_DID_INTEL_SKL_GT2_SWKSM, + PCI_DID_INTEL_SKL_GT3_SULTM, + PCI_DID_INTEL_SKL_GT3E_SULTM_1, + PCI_DID_INTEL_SKL_GT3E_SULTM_2, + PCI_DID_INTEL_SKL_GT3FE_SSRVM, + PCI_DID_INTEL_SKL_GT4_SHALM, + PCI_DID_INTEL_SKL_GT4E_SWSTM, + PCI_DID_INTEL_CFL_H_GT2, + PCI_DID_INTEL_CFL_H_XEON_GT2, + PCI_DID_INTEL_CFL_S_GT1_1, + PCI_DID_INTEL_CFL_S_GT1_2, + PCI_DID_INTEL_CFL_S_GT2_1, + PCI_DID_INTEL_CFL_S_GT2_2, + PCI_DID_INTEL_CFL_S_GT2_3, + PCI_DID_INTEL_CFL_S_GT2_4, + PCI_DID_INTEL_CFL_S_GT2_5, + PCI_DID_INTEL_ICL_GT0_ULT, + PCI_DID_INTEL_ICL_GT0_5_ULT, + PCI_DID_INTEL_ICL_GT1_ULT, + PCI_DID_INTEL_ICL_GT2_ULX_0, + PCI_DID_INTEL_ICL_GT2_ULX_1, + PCI_DID_INTEL_ICL_GT2_ULT_1, + PCI_DID_INTEL_ICL_GT2_ULX_2, + PCI_DID_INTEL_ICL_GT2_ULT_2, + PCI_DID_INTEL_ICL_GT2_ULX_3, + PCI_DID_INTEL_ICL_GT2_ULT_3, + PCI_DID_INTEL_ICL_GT2_ULX_4, + PCI_DID_INTEL_ICL_GT2_ULT_4, + PCI_DID_INTEL_ICL_GT2_ULX_5, + PCI_DID_INTEL_ICL_GT2_ULT_5, + PCI_DID_INTEL_ICL_GT2_ULX_6, + PCI_DID_INTEL_ICL_GT3_ULT, + PCI_DID_INTEL_CML_GT1_ULT_1, + PCI_DID_INTEL_CML_GT1_ULT_2, + PCI_DID_INTEL_CML_GT2_ULT_1, + PCI_DID_INTEL_CML_GT2_ULT_2, + PCI_DID_INTEL_CML_GT1_ULT_3, + PCI_DID_INTEL_CML_GT1_ULT_4, + PCI_DID_INTEL_CML_GT2_ULT_5, + PCI_DID_INTEL_CML_GT2_ULT_6, + PCI_DID_INTEL_CML_GT2_ULT_3, + PCI_DID_INTEL_CML_GT2_ULT_4, + PCI_DID_INTEL_CML_GT1_ULX_1, + PCI_DID_INTEL_CML_GT2_ULX_1, + PCI_DID_INTEL_CML_GT1_S_1, + PCI_DID_INTEL_CML_GT1_S_2, + PCI_DID_INTEL_CML_GT2_S_1, + PCI_DID_INTEL_CML_GT2_S_2, + PCI_DID_INTEL_CML_GT1_H_1, + PCI_DID_INTEL_CML_GT1_H_2, + PCI_DID_INTEL_CML_GT2_H_1, + PCI_DID_INTEL_CML_GT2_H_2, + PCI_DID_INTEL_CML_GT2_S_G0, + PCI_DID_INTEL_CML_GT2_S_P0, + PCI_DID_INTEL_CML_GT2_H_R0, + PCI_DID_INTEL_CML_GT2_H_R1, + PCI_DID_INTEL_TGL_GT0, + PCI_DID_INTEL_TGL_GT1_H_32, + PCI_DID_INTEL_TGL_GT1_H_16, + PCI_DID_INTEL_TGL_GT2_ULT, + PCI_DID_INTEL_TGL_GT2_ULX, + PCI_DID_INTEL_TGL_GT3_ULT, + PCI_DID_INTEL_TGL_GT2_ULT_1, + PCI_DID_INTEL_EHL_GT1_1, + PCI_DID_INTEL_EHL_GT2_1, + PCI_DID_INTEL_EHL_GT1_2, + PCI_DID_INTEL_EHL_GT2_2, + PCI_DID_INTEL_EHL_GT1_2_1, + PCI_DID_INTEL_EHL_GT1_3, + PCI_DID_INTEL_EHL_GT2_3, + PCI_DID_INTEL_JSL_GT1, + PCI_DID_INTEL_JSL_GT2, + PCI_DID_INTEL_JSL_GT3, + PCI_DID_INTEL_JSL_GT4, + PCI_DID_INTEL_ADL_GT0, + PCI_DID_INTEL_ADL_GT1, + PCI_DID_INTEL_ADL_GT1_1, + PCI_DID_INTEL_ADL_GT1_2, + PCI_DID_INTEL_ADL_GT1_3, + PCI_DID_INTEL_ADL_GT1_4, + PCI_DID_INTEL_ADL_GT1_5, + PCI_DID_INTEL_ADL_GT1_6, + PCI_DID_INTEL_ADL_GT1_7, + PCI_DID_INTEL_ADL_GT1_8, + PCI_DID_INTEL_ADL_GT1_9, + PCI_DID_INTEL_ADL_P_GT2, + PCI_DID_INTEL_ADL_P_GT2_1, + PCI_DID_INTEL_ADL_P_GT2_2, + PCI_DID_INTEL_ADL_P_GT2_3, + PCI_DID_INTEL_ADL_P_GT2_4, + PCI_DID_INTEL_ADL_P_GT2_5, + PCI_DID_INTEL_ADL_P_GT2_6, + PCI_DID_INTEL_ADL_P_GT2_7, + PCI_DID_INTEL_ADL_P_GT2_8, + PCI_DID_INTEL_ADL_P_GT2_9, + PCI_DID_INTEL_ADL_S_GT1, + PCI_DID_INTEL_ADL_M_GT1, + PCI_DID_INTEL_ADL_M_GT2, + PCI_DID_INTEL_ADL_M_GT3, + PCI_DID_INTEL_ADL_N_GT1, + PCI_DID_INTEL_ADL_N_GT2, + PCI_DID_INTEL_ADL_N_GT3, 0, }; static const struct pci_driver graphics_driver __pci_driver = { .ops = &graphics_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/hda/hda.c b/src/soc/intel/common/block/hda/hda.c index 1afc16c787..1311bcd6b2 100644 --- a/src/soc/intel/common/block/hda/hda.c +++ b/src/soc/intel/common/block/hda/hda.c @@ -21,42 +21,42 @@ static struct device_operations hda_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SKL_AUDIO, - PCI_DEVICE_ID_INTEL_SKL_H_AUDIO, - PCI_DEVICE_ID_INTEL_LWB_AUDIO, - PCI_DEVICE_ID_INTEL_LWB_AUDIO_SUPER, - PCI_DEVICE_ID_INTEL_KBL_AUDIO, - PCI_DEVICE_ID_INTEL_CNL_AUDIO, - PCI_DEVICE_ID_INTEL_CNP_H_AUDIO, - PCI_DEVICE_ID_INTEL_ICL_AUDIO, - PCI_DEVICE_ID_INTEL_CMP_AUDIO, - PCI_DEVICE_ID_INTEL_CMP_H_AUDIO, - PCI_DEVICE_ID_INTEL_BSW_AUDIO, - PCI_DEVICE_ID_INTEL_TGL_AUDIO, - PCI_DEVICE_ID_INTEL_TGL_H_AUDIO, - PCI_DEVICE_ID_INTEL_MCC_AUDIO, - PCI_DEVICE_ID_INTEL_JSP_AUDIO, - PCI_DEVICE_ID_INTEL_ADP_P_AUDIO, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_1, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_2, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_3, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_4, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_5, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_6, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_7, - PCI_DEVICE_ID_INTEL_ADP_S_AUDIO_8, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_1, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_2, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_3, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_4, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_5, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_6, - PCI_DEVICE_ID_INTEL_ADP_M_N_AUDIO_7, + PCI_DID_INTEL_SKL_AUDIO, + PCI_DID_INTEL_SKL_H_AUDIO, + PCI_DID_INTEL_LWB_AUDIO, + PCI_DID_INTEL_LWB_AUDIO_SUPER, + PCI_DID_INTEL_KBL_AUDIO, + PCI_DID_INTEL_CNL_AUDIO, + PCI_DID_INTEL_CNP_H_AUDIO, + PCI_DID_INTEL_ICL_AUDIO, + PCI_DID_INTEL_CMP_AUDIO, + PCI_DID_INTEL_CMP_H_AUDIO, + PCI_DID_INTEL_BSW_AUDIO, + PCI_DID_INTEL_TGL_AUDIO, + PCI_DID_INTEL_TGL_H_AUDIO, + PCI_DID_INTEL_MCC_AUDIO, + PCI_DID_INTEL_JSP_AUDIO, + PCI_DID_INTEL_ADP_P_AUDIO, + PCI_DID_INTEL_ADP_S_AUDIO_1, + PCI_DID_INTEL_ADP_S_AUDIO_2, + PCI_DID_INTEL_ADP_S_AUDIO_3, + PCI_DID_INTEL_ADP_S_AUDIO_4, + PCI_DID_INTEL_ADP_S_AUDIO_5, + PCI_DID_INTEL_ADP_S_AUDIO_6, + PCI_DID_INTEL_ADP_S_AUDIO_7, + PCI_DID_INTEL_ADP_S_AUDIO_8, + PCI_DID_INTEL_ADP_M_N_AUDIO_1, + PCI_DID_INTEL_ADP_M_N_AUDIO_2, + PCI_DID_INTEL_ADP_M_N_AUDIO_3, + PCI_DID_INTEL_ADP_M_N_AUDIO_4, + PCI_DID_INTEL_ADP_M_N_AUDIO_5, + PCI_DID_INTEL_ADP_M_N_AUDIO_6, + PCI_DID_INTEL_ADP_M_N_AUDIO_7, 0 }; static const struct pci_driver pch_hda __pci_driver = { .ops = &hda_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index c1d75e0fa7..ba10b2c5bb 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -175,113 +175,113 @@ static struct device_operations i2c_dev_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_I2C0, - PCI_DEVICE_ID_INTEL_SPT_I2C1, - PCI_DEVICE_ID_INTEL_SPT_I2C2, - PCI_DEVICE_ID_INTEL_SPT_I2C3, - PCI_DEVICE_ID_INTEL_SPT_I2C4, - PCI_DEVICE_ID_INTEL_SPT_I2C5, - PCI_DEVICE_ID_INTEL_UPT_H_I2C0, - PCI_DEVICE_ID_INTEL_UPT_H_I2C1, - PCI_DEVICE_ID_INTEL_UPT_H_I2C2, - PCI_DEVICE_ID_INTEL_UPT_H_I2C3, - PCI_DEVICE_ID_INTEL_APL_I2C0, - PCI_DEVICE_ID_INTEL_APL_I2C1, - PCI_DEVICE_ID_INTEL_APL_I2C2, - PCI_DEVICE_ID_INTEL_APL_I2C3, - PCI_DEVICE_ID_INTEL_APL_I2C4, - PCI_DEVICE_ID_INTEL_APL_I2C5, - PCI_DEVICE_ID_INTEL_APL_I2C6, - PCI_DEVICE_ID_INTEL_APL_I2C7, - PCI_DEVICE_ID_INTEL_CNL_I2C0, - PCI_DEVICE_ID_INTEL_CNL_I2C1, - PCI_DEVICE_ID_INTEL_CNL_I2C2, - PCI_DEVICE_ID_INTEL_CNL_I2C3, - PCI_DEVICE_ID_INTEL_CNL_I2C4, - PCI_DEVICE_ID_INTEL_CNL_I2C5, - PCI_DEVICE_ID_INTEL_GLK_I2C0, - PCI_DEVICE_ID_INTEL_GLK_I2C1, - PCI_DEVICE_ID_INTEL_GLK_I2C2, - PCI_DEVICE_ID_INTEL_GLK_I2C3, - PCI_DEVICE_ID_INTEL_GLK_I2C4, - PCI_DEVICE_ID_INTEL_GLK_I2C5, - PCI_DEVICE_ID_INTEL_GLK_I2C6, - PCI_DEVICE_ID_INTEL_GLK_I2C7, - PCI_DEVICE_ID_INTEL_CNP_H_I2C0, - PCI_DEVICE_ID_INTEL_CNP_H_I2C1, - PCI_DEVICE_ID_INTEL_CNP_H_I2C2, - PCI_DEVICE_ID_INTEL_CNP_H_I2C3, - PCI_DEVICE_ID_INTEL_ICP_I2C0, - PCI_DEVICE_ID_INTEL_ICP_I2C1, - PCI_DEVICE_ID_INTEL_ICP_I2C2, - PCI_DEVICE_ID_INTEL_ICP_I2C3, - PCI_DEVICE_ID_INTEL_ICP_I2C4, - PCI_DEVICE_ID_INTEL_ICP_I2C5, - PCI_DEVICE_ID_INTEL_CMP_I2C0, - PCI_DEVICE_ID_INTEL_CMP_I2C1, - PCI_DEVICE_ID_INTEL_CMP_I2C2, - PCI_DEVICE_ID_INTEL_CMP_I2C3, - PCI_DEVICE_ID_INTEL_CMP_I2C4, - PCI_DEVICE_ID_INTEL_CMP_I2C5, - PCI_DEVICE_ID_INTEL_CMP_H_I2C0, - PCI_DEVICE_ID_INTEL_CMP_H_I2C1, - PCI_DEVICE_ID_INTEL_CMP_H_I2C2, - PCI_DEVICE_ID_INTEL_CMP_H_I2C3, - PCI_DEVICE_ID_INTEL_TGP_I2C0, - PCI_DEVICE_ID_INTEL_TGP_I2C1, - PCI_DEVICE_ID_INTEL_TGP_I2C2, - PCI_DEVICE_ID_INTEL_TGP_I2C3, - PCI_DEVICE_ID_INTEL_TGP_I2C4, - PCI_DEVICE_ID_INTEL_TGP_I2C5, - PCI_DEVICE_ID_INTEL_TGP_I2C6, - PCI_DEVICE_ID_INTEL_TGP_I2C7, - PCI_DEVICE_ID_INTEL_TGP_H_I2C0, - PCI_DEVICE_ID_INTEL_TGP_H_I2C1, - PCI_DEVICE_ID_INTEL_TGP_H_I2C2, - PCI_DEVICE_ID_INTEL_TGP_H_I2C3, - PCI_DEVICE_ID_INTEL_TGP_H_I2C4, - PCI_DEVICE_ID_INTEL_TGP_H_I2C5, - PCI_DEVICE_ID_INTEL_TGP_H_I2C6, - PCI_DEVICE_ID_INTEL_MCC_I2C0, - PCI_DEVICE_ID_INTEL_MCC_I2C1, - PCI_DEVICE_ID_INTEL_MCC_I2C2, - PCI_DEVICE_ID_INTEL_MCC_I2C3, - PCI_DEVICE_ID_INTEL_MCC_I2C4, - PCI_DEVICE_ID_INTEL_MCC_I2C5, - PCI_DEVICE_ID_INTEL_MCC_I2C6, - PCI_DEVICE_ID_INTEL_MCC_I2C7, - PCI_DEVICE_ID_INTEL_JSP_I2C0, - PCI_DEVICE_ID_INTEL_JSP_I2C1, - PCI_DEVICE_ID_INTEL_JSP_I2C2, - PCI_DEVICE_ID_INTEL_JSP_I2C3, - PCI_DEVICE_ID_INTEL_JSP_I2C4, - PCI_DEVICE_ID_INTEL_JSP_I2C5, - PCI_DEVICE_ID_INTEL_ADP_P_I2C0, - PCI_DEVICE_ID_INTEL_ADP_P_I2C1, - PCI_DEVICE_ID_INTEL_ADP_P_I2C2, - PCI_DEVICE_ID_INTEL_ADP_P_I2C3, - PCI_DEVICE_ID_INTEL_ADP_P_I2C4, - PCI_DEVICE_ID_INTEL_ADP_P_I2C5, - PCI_DEVICE_ID_INTEL_ADP_P_I2C6, - PCI_DEVICE_ID_INTEL_ADP_P_I2C7, - PCI_DEVICE_ID_INTEL_ADP_S_I2C0, - PCI_DEVICE_ID_INTEL_ADP_S_I2C1, - PCI_DEVICE_ID_INTEL_ADP_S_I2C2, - PCI_DEVICE_ID_INTEL_ADP_S_I2C3, - PCI_DEVICE_ID_INTEL_ADP_S_I2C4, - PCI_DEVICE_ID_INTEL_ADP_S_I2C5, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C0, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C1, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C2, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C3, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C4, - PCI_DEVICE_ID_INTEL_ADP_M_N_I2C5, + PCI_DID_INTEL_SPT_I2C0, + PCI_DID_INTEL_SPT_I2C1, + PCI_DID_INTEL_SPT_I2C2, + PCI_DID_INTEL_SPT_I2C3, + PCI_DID_INTEL_SPT_I2C4, + PCI_DID_INTEL_SPT_I2C5, + PCI_DID_INTEL_UPT_H_I2C0, + PCI_DID_INTEL_UPT_H_I2C1, + PCI_DID_INTEL_UPT_H_I2C2, + PCI_DID_INTEL_UPT_H_I2C3, + PCI_DID_INTEL_APL_I2C0, + PCI_DID_INTEL_APL_I2C1, + PCI_DID_INTEL_APL_I2C2, + PCI_DID_INTEL_APL_I2C3, + PCI_DID_INTEL_APL_I2C4, + PCI_DID_INTEL_APL_I2C5, + PCI_DID_INTEL_APL_I2C6, + PCI_DID_INTEL_APL_I2C7, + PCI_DID_INTEL_CNL_I2C0, + PCI_DID_INTEL_CNL_I2C1, + PCI_DID_INTEL_CNL_I2C2, + PCI_DID_INTEL_CNL_I2C3, + PCI_DID_INTEL_CNL_I2C4, + PCI_DID_INTEL_CNL_I2C5, + PCI_DID_INTEL_GLK_I2C0, + PCI_DID_INTEL_GLK_I2C1, + PCI_DID_INTEL_GLK_I2C2, + PCI_DID_INTEL_GLK_I2C3, + PCI_DID_INTEL_GLK_I2C4, + PCI_DID_INTEL_GLK_I2C5, + PCI_DID_INTEL_GLK_I2C6, + PCI_DID_INTEL_GLK_I2C7, + PCI_DID_INTEL_CNP_H_I2C0, + PCI_DID_INTEL_CNP_H_I2C1, + PCI_DID_INTEL_CNP_H_I2C2, + PCI_DID_INTEL_CNP_H_I2C3, + PCI_DID_INTEL_ICP_I2C0, + PCI_DID_INTEL_ICP_I2C1, + PCI_DID_INTEL_ICP_I2C2, + PCI_DID_INTEL_ICP_I2C3, + PCI_DID_INTEL_ICP_I2C4, + PCI_DID_INTEL_ICP_I2C5, + PCI_DID_INTEL_CMP_I2C0, + PCI_DID_INTEL_CMP_I2C1, + PCI_DID_INTEL_CMP_I2C2, + PCI_DID_INTEL_CMP_I2C3, + PCI_DID_INTEL_CMP_I2C4, + PCI_DID_INTEL_CMP_I2C5, + PCI_DID_INTEL_CMP_H_I2C0, + PCI_DID_INTEL_CMP_H_I2C1, + PCI_DID_INTEL_CMP_H_I2C2, + PCI_DID_INTEL_CMP_H_I2C3, + PCI_DID_INTEL_TGP_I2C0, + PCI_DID_INTEL_TGP_I2C1, + PCI_DID_INTEL_TGP_I2C2, + PCI_DID_INTEL_TGP_I2C3, + PCI_DID_INTEL_TGP_I2C4, + PCI_DID_INTEL_TGP_I2C5, + PCI_DID_INTEL_TGP_I2C6, + PCI_DID_INTEL_TGP_I2C7, + PCI_DID_INTEL_TGP_H_I2C0, + PCI_DID_INTEL_TGP_H_I2C1, + PCI_DID_INTEL_TGP_H_I2C2, + PCI_DID_INTEL_TGP_H_I2C3, + PCI_DID_INTEL_TGP_H_I2C4, + PCI_DID_INTEL_TGP_H_I2C5, + PCI_DID_INTEL_TGP_H_I2C6, + PCI_DID_INTEL_MCC_I2C0, + PCI_DID_INTEL_MCC_I2C1, + PCI_DID_INTEL_MCC_I2C2, + PCI_DID_INTEL_MCC_I2C3, + PCI_DID_INTEL_MCC_I2C4, + PCI_DID_INTEL_MCC_I2C5, + PCI_DID_INTEL_MCC_I2C6, + PCI_DID_INTEL_MCC_I2C7, + PCI_DID_INTEL_JSP_I2C0, + PCI_DID_INTEL_JSP_I2C1, + PCI_DID_INTEL_JSP_I2C2, + PCI_DID_INTEL_JSP_I2C3, + PCI_DID_INTEL_JSP_I2C4, + PCI_DID_INTEL_JSP_I2C5, + PCI_DID_INTEL_ADP_P_I2C0, + PCI_DID_INTEL_ADP_P_I2C1, + PCI_DID_INTEL_ADP_P_I2C2, + PCI_DID_INTEL_ADP_P_I2C3, + PCI_DID_INTEL_ADP_P_I2C4, + PCI_DID_INTEL_ADP_P_I2C5, + PCI_DID_INTEL_ADP_P_I2C6, + PCI_DID_INTEL_ADP_P_I2C7, + PCI_DID_INTEL_ADP_S_I2C0, + PCI_DID_INTEL_ADP_S_I2C1, + PCI_DID_INTEL_ADP_S_I2C2, + PCI_DID_INTEL_ADP_S_I2C3, + PCI_DID_INTEL_ADP_S_I2C4, + PCI_DID_INTEL_ADP_S_I2C5, + PCI_DID_INTEL_ADP_M_N_I2C0, + PCI_DID_INTEL_ADP_M_N_I2C1, + PCI_DID_INTEL_ADP_M_N_I2C2, + PCI_DID_INTEL_ADP_M_N_I2C3, + PCI_DID_INTEL_ADP_M_N_I2C4, + PCI_DID_INTEL_ADP_M_N_I2C5, 0, }; static const struct pci_driver pch_i2c __pci_driver = { .ops = &i2c_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; #endif diff --git a/src/soc/intel/common/block/ipu/ipu.c b/src/soc/intel/common/block/ipu/ipu.c index a9d2bc093b..ead4094af3 100644 --- a/src/soc/intel/common/block/ipu/ipu.c +++ b/src/soc/intel/common/block/ipu/ipu.c @@ -12,16 +12,16 @@ struct device_operations ipu_pci_ops = { }; static const uint16_t pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_TGL_IPU, - PCI_DEVICE_ID_INTEL_TGL_H_IPU, - PCI_DEVICE_ID_INTEL_JSL_IPU, - PCI_DEVICE_ID_INTEL_ADL_IPU, - PCI_DEVICE_ID_INTEL_ADL_N_IPU, + PCI_DID_INTEL_TGL_IPU, + PCI_DID_INTEL_TGL_H_IPU, + PCI_DID_INTEL_JSL_IPU, + PCI_DID_INTEL_ADL_IPU, + PCI_DID_INTEL_ADL_N_IPU, 0 }; static const struct pci_driver intel_ipu __pci_driver = { .ops = &ipu_pci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/lpc/lpc.c b/src/soc/intel/common/block/lpc/lpc.c index 9706f92976..cd5cbe6f55 100644 --- a/src/soc/intel/common/block/lpc/lpc.c +++ b/src/soc/intel/common/block/lpc/lpc.c @@ -106,249 +106,249 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_LP_SAMPLE, - PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE, - PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM, - PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM, - PCI_DEVICE_ID_INTEL_SPT_H_H110, - PCI_DEVICE_ID_INTEL_SPT_H_H170, - PCI_DEVICE_ID_INTEL_SPT_H_Z170, - PCI_DEVICE_ID_INTEL_SPT_H_Q170, - PCI_DEVICE_ID_INTEL_SPT_H_Q150, - PCI_DEVICE_ID_INTEL_SPT_H_B150, - PCI_DEVICE_ID_INTEL_SPT_H_C236, - PCI_DEVICE_ID_INTEL_SPT_H_C232, - PCI_DEVICE_ID_INTEL_SPT_H_QM170, - PCI_DEVICE_ID_INTEL_SPT_H_HM170, - PCI_DEVICE_ID_INTEL_SPT_H_CM236, - PCI_DEVICE_ID_INTEL_SPT_H_HM175, - PCI_DEVICE_ID_INTEL_SPT_H_QM175, - PCI_DEVICE_ID_INTEL_SPT_H_CM238, - PCI_DEVICE_ID_INTEL_LWB_C621, - PCI_DEVICE_ID_INTEL_LWB_C622, - PCI_DEVICE_ID_INTEL_LWB_C624, - PCI_DEVICE_ID_INTEL_LWB_C625, - PCI_DEVICE_ID_INTEL_LWB_C626, - PCI_DEVICE_ID_INTEL_LWB_C627, - PCI_DEVICE_ID_INTEL_LWB_C628, - PCI_DEVICE_ID_INTEL_LWB_C629, - PCI_DEVICE_ID_INTEL_LWB_C621A, - PCI_DEVICE_ID_INTEL_LWB_C627A, - PCI_DEVICE_ID_INTEL_LWB_C629A, - PCI_DEVICE_ID_INTEL_LWB_C624_SUPER, - PCI_DEVICE_ID_INTEL_LWB_C627_SUPER_1, - PCI_DEVICE_ID_INTEL_LWB_C621_SUPER, - PCI_DEVICE_ID_INTEL_LWB_C627_SUPER_2, - PCI_DEVICE_ID_INTEL_LWB_C628_SUPER, - PCI_DEVICE_ID_INTEL_LWB_C621A_SUPER, - PCI_DEVICE_ID_INTEL_LWB_C627A_SUPER, - PCI_DEVICE_ID_INTEL_LWB_C629A_SUPER, - PCI_DEVICE_ID_INTEL_EMB_SUPER, - PCI_DEVICE_ID_INTEL_UPT_H_Q270, - PCI_DEVICE_ID_INTEL_UPT_H_H270, - PCI_DEVICE_ID_INTEL_UPT_H_Z270, - PCI_DEVICE_ID_INTEL_UPT_H_Q250, - PCI_DEVICE_ID_INTEL_UPT_H_B250, - PCI_DEVICE_ID_INTEL_UPT_H_Z370, - PCI_DEVICE_ID_INTEL_UPT_H_H310C, - PCI_DEVICE_ID_INTEL_UPT_H_B365, - PCI_DEVICE_ID_INTEL_SPT_LP_Y_PREMIUM_HDCP22, - PCI_DEVICE_ID_INTEL_SPT_LP_U_PREMIUM_HDCP22, - PCI_DEVICE_ID_INTEL_SPT_LP_U_BASE_HDCP22, - PCI_DEVICE_ID_INTEL_UPT_LP_SUPER_SKU, - PCI_DEVICE_ID_INTEL_UPT_LP_U_BASE, - PCI_DEVICE_ID_INTEL_UPT_LP_U_PREMIUM, - PCI_DEVICE_ID_INTEL_UPT_LP_Y_PREMIUM, - PCI_DEVICE_ID_INTEL_APL_LPC, - PCI_DEVICE_ID_INTEL_GLK_LPC, - PCI_DEVICE_ID_INTEL_GLK_ESPI, - PCI_DEVICE_ID_INTEL_CNL_BASE_U_LPC, - PCI_DEVICE_ID_INTEL_CNL_U_PREMIUM_LPC, - PCI_DEVICE_ID_INTEL_CNL_Y_PREMIUM_LPC, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_H310, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_H370, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_Z390, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_Q370, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_B360, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_C246, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_C242, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_QM370, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_HM370, - PCI_DEVICE_ID_INTEL_CNP_H_LPC_CM246, - PCI_DEVICE_ID_INTEL_ICL_BASE_U_ESPI, - PCI_DEVICE_ID_INTEL_ICL_BASE_Y_ESPI, - PCI_DEVICE_ID_INTEL_ICL_U_PREMIUM_ESPI, - PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_ESPI, - PCI_DEVICE_ID_INTEL_ICL_U_SUPER_U_ESPI_REV0, - PCI_DEVICE_ID_INTEL_ICL_SUPER_Y_ESPI, - PCI_DEVICE_ID_INTEL_ICL_Y_PREMIUM_ESPI, - PCI_DEVICE_ID_INTEL_CMP_SUPER_U_LPC, - PCI_DEVICE_ID_INTEL_CMP_PREMIUM_Y_LPC, - PCI_DEVICE_ID_INTEL_CMP_PREMIUM_U_LPC, - PCI_DEVICE_ID_INTEL_CMP_BASE_U_LPC, - PCI_DEVICE_ID_INTEL_CMP_SUPER_Y_LPC, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_HM470, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_WM490, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_QM480, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_W480, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_H470, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_Z490, - PCI_DEVICE_ID_INTEL_CMP_H_LPC_Q470, - PCI_DEVICE_ID_INTEL_TGP_ESPI_0, - PCI_DEVICE_ID_INTEL_TGP_SUPER_U_ESPI, - PCI_DEVICE_ID_INTEL_TGP_PREMIUM_U_ESPI, - PCI_DEVICE_ID_INTEL_TGP_BASE_U_ESPI, - PCI_DEVICE_ID_INTEL_TGP_ESPI_1, - PCI_DEVICE_ID_INTEL_TGP_ESPI_2, - PCI_DEVICE_ID_INTEL_TGP_SUPER_Y_ESPI, - PCI_DEVICE_ID_INTEL_TGP_PREMIUM_Y_ESPI, - PCI_DEVICE_ID_INTEL_TGP_ESPI_3, - PCI_DEVICE_ID_INTEL_TGP_ESPI_4, - PCI_DEVICE_ID_INTEL_TGP_ESPI_5, - PCI_DEVICE_ID_INTEL_TGP_ESPI_6, - PCI_DEVICE_ID_INTEL_TGP_ESPI_7, - PCI_DEVICE_ID_INTEL_TGP_ESPI_8, - PCI_DEVICE_ID_INTEL_TGP_ESPI_9, - PCI_DEVICE_ID_INTEL_TGP_ESPI_10, - PCI_DEVICE_ID_INTEL_TGP_ESPI_11, - PCI_DEVICE_ID_INTEL_TGP_ESPI_12, - PCI_DEVICE_ID_INTEL_TGP_ESPI_13, - PCI_DEVICE_ID_INTEL_TGP_ESPI_14, - PCI_DEVICE_ID_INTEL_TGP_ESPI_15, - PCI_DEVICE_ID_INTEL_TGP_ESPI_16, - PCI_DEVICE_ID_INTEL_TGP_ESPI_17, - PCI_DEVICE_ID_INTEL_TGP_ESPI_18, - PCI_DEVICE_ID_INTEL_TGP_ESPI_19, - PCI_DEVICE_ID_INTEL_TGP_ESPI_20, - PCI_DEVICE_ID_INTEL_TGP_ESPI_21, - PCI_DEVICE_ID_INTEL_TGP_ESPI_22, - PCI_DEVICE_ID_INTEL_TGP_ESPI_23, - PCI_DEVICE_ID_INTEL_TGP_ESPI_24, - PCI_DEVICE_ID_INTEL_TGP_ESPI_25, - PCI_DEVICE_ID_INTEL_TGP_ESPI_26, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_B560, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_H510, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_H570, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_Q570, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_W580, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_Z590, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_HM570, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_QM580, - PCI_DEVICE_ID_INTEL_TGP_H_ESPI_WM590, - PCI_DEVICE_ID_INTEL_MCC_ESPI_0, - PCI_DEVICE_ID_INTEL_MCC_ESPI_1, - PCI_DEVICE_ID_INTEL_MCC_BASE_ESPI, - PCI_DEVICE_ID_INTEL_MCC_PREMIUM_ESPI, - PCI_DEVICE_ID_INTEL_MCC_SUPER_ESPI, - PCI_DEVICE_ID_INTEL_MCC_ESPI_2, - PCI_DEVICE_ID_INTEL_MCC_ESPI_3, - PCI_DEVICE_ID_INTEL_MCC_ESPI_4, - PCI_DEVICE_ID_INTEL_JSP_SUPER_ESPI, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_0, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_1, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_2, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_3, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_4, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_5, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_6, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_7, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_8, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_9, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_10, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_11, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_12, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_13, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_14, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_15, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_16, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_17, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_18, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_19, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_20, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_21, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_22, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_23, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_24, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_25, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_26, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_27, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_28, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_29, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_30, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_31, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_32, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_33, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_0, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_1, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_2, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_3, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_4, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_5, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_6, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_7, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_8, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_9, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_10, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_11, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_12, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_13, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_14, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_15, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_16, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_17, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_18, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_19, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_20, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_21, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_22, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_23, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_24, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_25, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_26, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_27, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_28, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_29, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_30, - PCI_DEVICE_ID_INTEL_ADP_S_ESPI_31, - PCI_DEVICE_ID_INTEL_ADP_P_ESPI_32, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_0, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_1, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_2, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_3, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_4, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_5, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_7, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_8, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_9, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_10, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_11, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_12, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_13, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_14, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_15, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_16, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_17, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_18, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_19, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_20, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_21, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_22, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_23, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_24, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_25, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_26, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_27, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_28, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_29, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_30, - PCI_DEVICE_ID_INTEL_ADP_M_N_ESPI_31, - PCI_DEVICE_ID_INTEL_ADP_M_ESPI_32, - PCI_DEVICE_ID_INTEL_SPR_ESPI_1, + PCI_DID_INTEL_SPT_LP_SAMPLE, + PCI_DID_INTEL_SPT_LP_U_BASE, + PCI_DID_INTEL_SPT_LP_U_PREMIUM, + PCI_DID_INTEL_SPT_LP_Y_PREMIUM, + PCI_DID_INTEL_SPT_H_H110, + PCI_DID_INTEL_SPT_H_H170, + PCI_DID_INTEL_SPT_H_Z170, + PCI_DID_INTEL_SPT_H_Q170, + PCI_DID_INTEL_SPT_H_Q150, + PCI_DID_INTEL_SPT_H_B150, + PCI_DID_INTEL_SPT_H_C236, + PCI_DID_INTEL_SPT_H_C232, + PCI_DID_INTEL_SPT_H_QM170, + PCI_DID_INTEL_SPT_H_HM170, + PCI_DID_INTEL_SPT_H_CM236, + PCI_DID_INTEL_SPT_H_HM175, + PCI_DID_INTEL_SPT_H_QM175, + PCI_DID_INTEL_SPT_H_CM238, + PCI_DID_INTEL_LWB_C621, + PCI_DID_INTEL_LWB_C622, + PCI_DID_INTEL_LWB_C624, + PCI_DID_INTEL_LWB_C625, + PCI_DID_INTEL_LWB_C626, + PCI_DID_INTEL_LWB_C627, + PCI_DID_INTEL_LWB_C628, + PCI_DID_INTEL_LWB_C629, + PCI_DID_INTEL_LWB_C621A, + PCI_DID_INTEL_LWB_C627A, + PCI_DID_INTEL_LWB_C629A, + PCI_DID_INTEL_LWB_C624_SUPER, + PCI_DID_INTEL_LWB_C627_SUPER_1, + PCI_DID_INTEL_LWB_C621_SUPER, + PCI_DID_INTEL_LWB_C627_SUPER_2, + PCI_DID_INTEL_LWB_C628_SUPER, + PCI_DID_INTEL_LWB_C621A_SUPER, + PCI_DID_INTEL_LWB_C627A_SUPER, + PCI_DID_INTEL_LWB_C629A_SUPER, + PCI_DID_INTEL_EMB_SUPER, + PCI_DID_INTEL_UPT_H_Q270, + PCI_DID_INTEL_UPT_H_H270, + PCI_DID_INTEL_UPT_H_Z270, + PCI_DID_INTEL_UPT_H_Q250, + PCI_DID_INTEL_UPT_H_B250, + PCI_DID_INTEL_UPT_H_Z370, + PCI_DID_INTEL_UPT_H_H310C, + PCI_DID_INTEL_UPT_H_B365, + PCI_DID_INTEL_SPT_LP_Y_PREMIUM_HDCP22, + PCI_DID_INTEL_SPT_LP_U_PREMIUM_HDCP22, + PCI_DID_INTEL_SPT_LP_U_BASE_HDCP22, + PCI_DID_INTEL_UPT_LP_SUPER_SKU, + PCI_DID_INTEL_UPT_LP_U_BASE, + PCI_DID_INTEL_UPT_LP_U_PREMIUM, + PCI_DID_INTEL_UPT_LP_Y_PREMIUM, + PCI_DID_INTEL_APL_LPC, + PCI_DID_INTEL_GLK_LPC, + PCI_DID_INTEL_GLK_ESPI, + PCI_DID_INTEL_CNL_BASE_U_LPC, + PCI_DID_INTEL_CNL_U_PREMIUM_LPC, + PCI_DID_INTEL_CNL_Y_PREMIUM_LPC, + PCI_DID_INTEL_CNP_H_LPC_H310, + PCI_DID_INTEL_CNP_H_LPC_H370, + PCI_DID_INTEL_CNP_H_LPC_Z390, + PCI_DID_INTEL_CNP_H_LPC_Q370, + PCI_DID_INTEL_CNP_H_LPC_B360, + PCI_DID_INTEL_CNP_H_LPC_C246, + PCI_DID_INTEL_CNP_H_LPC_C242, + PCI_DID_INTEL_CNP_H_LPC_QM370, + PCI_DID_INTEL_CNP_H_LPC_HM370, + PCI_DID_INTEL_CNP_H_LPC_CM246, + PCI_DID_INTEL_ICL_BASE_U_ESPI, + PCI_DID_INTEL_ICL_BASE_Y_ESPI, + PCI_DID_INTEL_ICL_U_PREMIUM_ESPI, + PCI_DID_INTEL_ICL_U_SUPER_U_ESPI, + PCI_DID_INTEL_ICL_U_SUPER_U_ESPI_REV0, + PCI_DID_INTEL_ICL_SUPER_Y_ESPI, + PCI_DID_INTEL_ICL_Y_PREMIUM_ESPI, + PCI_DID_INTEL_CMP_SUPER_U_LPC, + PCI_DID_INTEL_CMP_PREMIUM_Y_LPC, + PCI_DID_INTEL_CMP_PREMIUM_U_LPC, + PCI_DID_INTEL_CMP_BASE_U_LPC, + PCI_DID_INTEL_CMP_SUPER_Y_LPC, + PCI_DID_INTEL_CMP_H_LPC_HM470, + PCI_DID_INTEL_CMP_H_LPC_WM490, + PCI_DID_INTEL_CMP_H_LPC_QM480, + PCI_DID_INTEL_CMP_H_LPC_W480, + PCI_DID_INTEL_CMP_H_LPC_H470, + PCI_DID_INTEL_CMP_H_LPC_Z490, + PCI_DID_INTEL_CMP_H_LPC_Q470, + PCI_DID_INTEL_TGP_ESPI_0, + PCI_DID_INTEL_TGP_SUPER_U_ESPI, + PCI_DID_INTEL_TGP_PREMIUM_U_ESPI, + PCI_DID_INTEL_TGP_BASE_U_ESPI, + PCI_DID_INTEL_TGP_ESPI_1, + PCI_DID_INTEL_TGP_ESPI_2, + PCI_DID_INTEL_TGP_SUPER_Y_ESPI, + PCI_DID_INTEL_TGP_PREMIUM_Y_ESPI, + PCI_DID_INTEL_TGP_ESPI_3, + PCI_DID_INTEL_TGP_ESPI_4, + PCI_DID_INTEL_TGP_ESPI_5, + PCI_DID_INTEL_TGP_ESPI_6, + PCI_DID_INTEL_TGP_ESPI_7, + PCI_DID_INTEL_TGP_ESPI_8, + PCI_DID_INTEL_TGP_ESPI_9, + PCI_DID_INTEL_TGP_ESPI_10, + PCI_DID_INTEL_TGP_ESPI_11, + PCI_DID_INTEL_TGP_ESPI_12, + PCI_DID_INTEL_TGP_ESPI_13, + PCI_DID_INTEL_TGP_ESPI_14, + PCI_DID_INTEL_TGP_ESPI_15, + PCI_DID_INTEL_TGP_ESPI_16, + PCI_DID_INTEL_TGP_ESPI_17, + PCI_DID_INTEL_TGP_ESPI_18, + PCI_DID_INTEL_TGP_ESPI_19, + PCI_DID_INTEL_TGP_ESPI_20, + PCI_DID_INTEL_TGP_ESPI_21, + PCI_DID_INTEL_TGP_ESPI_22, + PCI_DID_INTEL_TGP_ESPI_23, + PCI_DID_INTEL_TGP_ESPI_24, + PCI_DID_INTEL_TGP_ESPI_25, + PCI_DID_INTEL_TGP_ESPI_26, + PCI_DID_INTEL_TGP_H_ESPI_B560, + PCI_DID_INTEL_TGP_H_ESPI_H510, + PCI_DID_INTEL_TGP_H_ESPI_H570, + PCI_DID_INTEL_TGP_H_ESPI_Q570, + PCI_DID_INTEL_TGP_H_ESPI_W580, + PCI_DID_INTEL_TGP_H_ESPI_Z590, + PCI_DID_INTEL_TGP_H_ESPI_HM570, + PCI_DID_INTEL_TGP_H_ESPI_QM580, + PCI_DID_INTEL_TGP_H_ESPI_WM590, + PCI_DID_INTEL_MCC_ESPI_0, + PCI_DID_INTEL_MCC_ESPI_1, + PCI_DID_INTEL_MCC_BASE_ESPI, + PCI_DID_INTEL_MCC_PREMIUM_ESPI, + PCI_DID_INTEL_MCC_SUPER_ESPI, + PCI_DID_INTEL_MCC_ESPI_2, + 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_P_ESPI_32, + PCI_DID_INTEL_ADP_P_ESPI_33, + 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, + PCI_DID_INTEL_ADP_S_ESPI_22, + PCI_DID_INTEL_ADP_S_ESPI_23, + PCI_DID_INTEL_ADP_S_ESPI_24, + PCI_DID_INTEL_ADP_S_ESPI_25, + PCI_DID_INTEL_ADP_S_ESPI_26, + PCI_DID_INTEL_ADP_S_ESPI_27, + PCI_DID_INTEL_ADP_S_ESPI_28, + PCI_DID_INTEL_ADP_S_ESPI_29, + PCI_DID_INTEL_ADP_S_ESPI_30, + PCI_DID_INTEL_ADP_S_ESPI_31, + PCI_DID_INTEL_ADP_P_ESPI_32, + PCI_DID_INTEL_ADP_M_N_ESPI_0, + PCI_DID_INTEL_ADP_M_N_ESPI_1, + PCI_DID_INTEL_ADP_M_N_ESPI_2, + PCI_DID_INTEL_ADP_M_N_ESPI_3, + PCI_DID_INTEL_ADP_M_N_ESPI_4, + PCI_DID_INTEL_ADP_M_N_ESPI_5, + PCI_DID_INTEL_ADP_M_N_ESPI_7, + PCI_DID_INTEL_ADP_M_N_ESPI_8, + PCI_DID_INTEL_ADP_M_N_ESPI_9, + PCI_DID_INTEL_ADP_M_N_ESPI_10, + PCI_DID_INTEL_ADP_M_N_ESPI_11, + PCI_DID_INTEL_ADP_M_N_ESPI_12, + PCI_DID_INTEL_ADP_M_N_ESPI_13, + PCI_DID_INTEL_ADP_M_N_ESPI_14, + PCI_DID_INTEL_ADP_M_N_ESPI_15, + PCI_DID_INTEL_ADP_M_N_ESPI_16, + PCI_DID_INTEL_ADP_M_N_ESPI_17, + PCI_DID_INTEL_ADP_M_N_ESPI_18, + PCI_DID_INTEL_ADP_M_N_ESPI_19, + PCI_DID_INTEL_ADP_M_N_ESPI_20, + PCI_DID_INTEL_ADP_M_N_ESPI_21, + PCI_DID_INTEL_ADP_M_N_ESPI_22, + PCI_DID_INTEL_ADP_M_N_ESPI_23, + PCI_DID_INTEL_ADP_M_N_ESPI_24, + PCI_DID_INTEL_ADP_M_N_ESPI_25, + PCI_DID_INTEL_ADP_M_N_ESPI_26, + PCI_DID_INTEL_ADP_M_N_ESPI_27, + PCI_DID_INTEL_ADP_M_N_ESPI_28, + PCI_DID_INTEL_ADP_M_N_ESPI_29, + PCI_DID_INTEL_ADP_M_N_ESPI_30, + PCI_DID_INTEL_ADP_M_N_ESPI_31, + PCI_DID_INTEL_ADP_M_ESPI_32, + PCI_DID_INTEL_SPR_ESPI_1, 0 }; static const struct pci_driver pch_lpc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/p2sb/p2sb.c b/src/soc/intel/common/block/p2sb/p2sb.c index 16da6911c9..03c341a26d 100644 --- a/src/soc/intel/common/block/p2sb/p2sb.c +++ b/src/soc/intel/common/block/p2sb/p2sb.c @@ -144,30 +144,30 @@ static const struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_P2SB, - PCI_DEVICE_ID_INTEL_GLK_P2SB, - PCI_DEVICE_ID_INTEL_LWB_P2SB, - PCI_DEVICE_ID_INTEL_LWB_P2SB_SUPER, - PCI_DEVICE_ID_INTEL_SKL_LP_P2SB, - PCI_DEVICE_ID_INTEL_SKL_P2SB, - PCI_DEVICE_ID_INTEL_KBL_P2SB, - PCI_DEVICE_ID_INTEL_CNL_P2SB, - PCI_DEVICE_ID_INTEL_CNP_H_P2SB, - PCI_DEVICE_ID_INTEL_ICL_P2SB, - PCI_DEVICE_ID_INTEL_CMP_P2SB, - PCI_DEVICE_ID_INTEL_CMP_H_P2SB, - PCI_DEVICE_ID_INTEL_TGL_P2SB, - PCI_DEVICE_ID_INTEL_TGL_H_P2SB, - PCI_DEVICE_ID_INTEL_EHL_P2SB, - PCI_DEVICE_ID_INTEL_JSP_P2SB, - PCI_DEVICE_ID_INTEL_ADP_P_P2SB, - PCI_DEVICE_ID_INTEL_ADP_S_P2SB, - PCI_DEVICE_ID_INTEL_ADP_M_P2SB, + PCI_DID_INTEL_APL_P2SB, + PCI_DID_INTEL_GLK_P2SB, + PCI_DID_INTEL_LWB_P2SB, + PCI_DID_INTEL_LWB_P2SB_SUPER, + PCI_DID_INTEL_SKL_LP_P2SB, + PCI_DID_INTEL_SKL_P2SB, + PCI_DID_INTEL_KBL_P2SB, + PCI_DID_INTEL_CNL_P2SB, + PCI_DID_INTEL_CNP_H_P2SB, + PCI_DID_INTEL_ICL_P2SB, + PCI_DID_INTEL_CMP_P2SB, + PCI_DID_INTEL_CMP_H_P2SB, + PCI_DID_INTEL_TGL_P2SB, + PCI_DID_INTEL_TGL_H_P2SB, + PCI_DID_INTEL_EHL_P2SB, + PCI_DID_INTEL_JSP_P2SB, + PCI_DID_INTEL_ADP_P_P2SB, + PCI_DID_INTEL_ADP_S_P2SB, + PCI_DID_INTEL_ADP_M_P2SB, 0, }; static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/p2sb/p2sblib.c b/src/soc/intel/common/block/p2sb/p2sblib.c index d00606dd89..faef79adfd 100644 --- a/src/soc/intel/common/block/p2sb/p2sblib.c +++ b/src/soc/intel/common/block/p2sb/p2sblib.c @@ -16,7 +16,7 @@ bool p2sb_dev_is_hidden(pci_devfn_t dev) if (pci_vid == 0xffff) return true; - if (pci_vid == PCI_VENDOR_ID_INTEL) + if (pci_vid == PCI_VID_INTEL) return false; printk(BIOS_ERR, "P2SB PCI_VENDOR_ID is invalid, unknown if hidden\n"); return true; diff --git a/src/soc/intel/common/block/pcie/pcie.c b/src/soc/intel/common/block/pcie/pcie.c index b17a1f37ce..1ac879c661 100644 --- a/src/soc/intel/common/block/pcie/pcie.c +++ b/src/soc/intel/common/block/pcie/pcie.c @@ -66,313 +66,313 @@ static struct device_operations device_ops = { }; static const unsigned short pcie_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP9, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP10, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP11, - PCI_DEVICE_ID_INTEL_SPT_LP_PCIE_RP12, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP9, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP10, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP11, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP12, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP13, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP14, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP15, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP16, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP17, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP18, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP19, - PCI_DEVICE_ID_INTEL_SPT_H_PCIE_RP20, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP1, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP2, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP3, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP4, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP5, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP6, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP7, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP8, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP9, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP10, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP11, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP12, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP13, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP14, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP15, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP16, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP17, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP18, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP19, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP20, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP1_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP2_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP3_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP4_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP5_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP6_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP7_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP8_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP9_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP10_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP11_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP12_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP13_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP14_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP15_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP16_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP17_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP18_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP19_SUPER, - PCI_DEVICE_ID_INTEL_LWB_PCIE_RP20_SUPER, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP9, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP10, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP11, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP12, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP13, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP14, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP15, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP16, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP17, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP18, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP19, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP20, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP21, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP22, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP23, - PCI_DEVICE_ID_INTEL_UPT_H_PCIE_RP24, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP9, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP10, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP11, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP12, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP13, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP14, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP15, - PCI_DEVICE_ID_INTEL_CNL_LP_PCIE_RP16, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP9, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP10, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP11, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP12, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP13, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP14, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP15, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP16, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP17, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP18, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP19, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP20, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP21, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP22, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP23, - PCI_DEVICE_ID_INTEL_CNP_H_PCIE_RP24, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP9, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP10, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP11, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP12, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP13, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP14, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP15, - PCI_DEVICE_ID_INTEL_ICP_LP_PCIE_RP16, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP9, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP10, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP11, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP12, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP13, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP14, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP15, - PCI_DEVICE_ID_INTEL_CMP_LP_PCIE_RP16, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP9, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP10, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP11, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP12, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP13, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP14, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP15, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP16, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP17, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP18, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP19, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP20, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP21, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP22, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP23, - PCI_DEVICE_ID_INTEL_CMP_H_PCIE_RP24, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP9, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP10, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP11, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP12, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP13, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP14, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP15, - PCI_DEVICE_ID_INTEL_TGP_LP_PCIE_RP16, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP1, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP2, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP3, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP4, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP5, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP6, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP7, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP8, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP9, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP10, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP11, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP12, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP13, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP14, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP15, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP16, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP17, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP18, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP19, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP20, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP21, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP22, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP23, - PCI_DEVICE_ID_INTEL_TGP_H_PCIE_RP24, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP1, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP2, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP3, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP4, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP5, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP6, - PCI_DEVICE_ID_INTEL_MCC_PCIE_RP7, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP1, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP2, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP3, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP4, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP5, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP6, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP7, - PCI_DEVICE_ID_INTEL_JSP_PCIE_RP8, - PCI_DEVICE_ID_INTEL_ADL_P_PCIE_RP1, - PCI_DEVICE_ID_INTEL_ADL_P_PCIE_RP2, - PCI_DEVICE_ID_INTEL_ADL_P_PCIE_RP3, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP1, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP2, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP3, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP4, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP5, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP6, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP7, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP8, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP9, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP10, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP11, - PCI_DEVICE_ID_INTEL_ADP_P_PCIE_RP12, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP1, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP2, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP3, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP4, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP5, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP6, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP7, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP8, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP9, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP10, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP11, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP12, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP13, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP14, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP15, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP16, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP17, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP18, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP19, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP20, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP21, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP22, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP23, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP24, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP25, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP26, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP27, - PCI_DEVICE_ID_INTEL_ADP_S_PCIE_RP28, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP1, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP2, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP3, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP4, - PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP5, - PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP6, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP7, - PCI_DEVICE_ID_INTEL_ADP_M_PCIE_RP8, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP9, - PCI_DEVICE_ID_INTEL_ADP_M_N_PCIE_RP10, - PCI_DEVICE_ID_INTEL_ADP_N_PCIE_RP11, - PCI_DEVICE_ID_INTEL_ADP_N_PCIE_RP12, + PCI_DID_INTEL_SPT_LP_PCIE_RP1, + PCI_DID_INTEL_SPT_LP_PCIE_RP2, + PCI_DID_INTEL_SPT_LP_PCIE_RP3, + PCI_DID_INTEL_SPT_LP_PCIE_RP4, + PCI_DID_INTEL_SPT_LP_PCIE_RP5, + PCI_DID_INTEL_SPT_LP_PCIE_RP6, + PCI_DID_INTEL_SPT_LP_PCIE_RP7, + PCI_DID_INTEL_SPT_LP_PCIE_RP8, + PCI_DID_INTEL_SPT_LP_PCIE_RP9, + PCI_DID_INTEL_SPT_LP_PCIE_RP10, + PCI_DID_INTEL_SPT_LP_PCIE_RP11, + PCI_DID_INTEL_SPT_LP_PCIE_RP12, + PCI_DID_INTEL_SPT_H_PCIE_RP1, + PCI_DID_INTEL_SPT_H_PCIE_RP2, + PCI_DID_INTEL_SPT_H_PCIE_RP3, + PCI_DID_INTEL_SPT_H_PCIE_RP4, + PCI_DID_INTEL_SPT_H_PCIE_RP5, + PCI_DID_INTEL_SPT_H_PCIE_RP6, + PCI_DID_INTEL_SPT_H_PCIE_RP7, + PCI_DID_INTEL_SPT_H_PCIE_RP8, + PCI_DID_INTEL_SPT_H_PCIE_RP9, + PCI_DID_INTEL_SPT_H_PCIE_RP10, + PCI_DID_INTEL_SPT_H_PCIE_RP11, + PCI_DID_INTEL_SPT_H_PCIE_RP12, + PCI_DID_INTEL_SPT_H_PCIE_RP13, + PCI_DID_INTEL_SPT_H_PCIE_RP14, + PCI_DID_INTEL_SPT_H_PCIE_RP15, + PCI_DID_INTEL_SPT_H_PCIE_RP16, + PCI_DID_INTEL_SPT_H_PCIE_RP17, + PCI_DID_INTEL_SPT_H_PCIE_RP18, + PCI_DID_INTEL_SPT_H_PCIE_RP19, + PCI_DID_INTEL_SPT_H_PCIE_RP20, + PCI_DID_INTEL_LWB_PCIE_RP1, + PCI_DID_INTEL_LWB_PCIE_RP2, + PCI_DID_INTEL_LWB_PCIE_RP3, + PCI_DID_INTEL_LWB_PCIE_RP4, + PCI_DID_INTEL_LWB_PCIE_RP5, + PCI_DID_INTEL_LWB_PCIE_RP6, + PCI_DID_INTEL_LWB_PCIE_RP7, + PCI_DID_INTEL_LWB_PCIE_RP8, + PCI_DID_INTEL_LWB_PCIE_RP9, + PCI_DID_INTEL_LWB_PCIE_RP10, + PCI_DID_INTEL_LWB_PCIE_RP11, + PCI_DID_INTEL_LWB_PCIE_RP12, + PCI_DID_INTEL_LWB_PCIE_RP13, + PCI_DID_INTEL_LWB_PCIE_RP14, + PCI_DID_INTEL_LWB_PCIE_RP15, + PCI_DID_INTEL_LWB_PCIE_RP16, + PCI_DID_INTEL_LWB_PCIE_RP17, + PCI_DID_INTEL_LWB_PCIE_RP18, + PCI_DID_INTEL_LWB_PCIE_RP19, + PCI_DID_INTEL_LWB_PCIE_RP20, + PCI_DID_INTEL_LWB_PCIE_RP1_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP2_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP3_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP4_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP5_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP6_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP7_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP8_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP9_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP10_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP11_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP12_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP13_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP14_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP15_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP16_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP17_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP18_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP19_SUPER, + PCI_DID_INTEL_LWB_PCIE_RP20_SUPER, + PCI_DID_INTEL_UPT_H_PCIE_RP1, + PCI_DID_INTEL_UPT_H_PCIE_RP2, + PCI_DID_INTEL_UPT_H_PCIE_RP3, + PCI_DID_INTEL_UPT_H_PCIE_RP4, + PCI_DID_INTEL_UPT_H_PCIE_RP5, + PCI_DID_INTEL_UPT_H_PCIE_RP6, + PCI_DID_INTEL_UPT_H_PCIE_RP7, + PCI_DID_INTEL_UPT_H_PCIE_RP8, + PCI_DID_INTEL_UPT_H_PCIE_RP9, + PCI_DID_INTEL_UPT_H_PCIE_RP10, + PCI_DID_INTEL_UPT_H_PCIE_RP11, + PCI_DID_INTEL_UPT_H_PCIE_RP12, + PCI_DID_INTEL_UPT_H_PCIE_RP13, + PCI_DID_INTEL_UPT_H_PCIE_RP14, + PCI_DID_INTEL_UPT_H_PCIE_RP15, + PCI_DID_INTEL_UPT_H_PCIE_RP16, + PCI_DID_INTEL_UPT_H_PCIE_RP17, + PCI_DID_INTEL_UPT_H_PCIE_RP18, + PCI_DID_INTEL_UPT_H_PCIE_RP19, + PCI_DID_INTEL_UPT_H_PCIE_RP20, + PCI_DID_INTEL_UPT_H_PCIE_RP21, + PCI_DID_INTEL_UPT_H_PCIE_RP22, + PCI_DID_INTEL_UPT_H_PCIE_RP23, + PCI_DID_INTEL_UPT_H_PCIE_RP24, + PCI_DID_INTEL_CNL_LP_PCIE_RP1, + PCI_DID_INTEL_CNL_LP_PCIE_RP2, + PCI_DID_INTEL_CNL_LP_PCIE_RP3, + PCI_DID_INTEL_CNL_LP_PCIE_RP4, + PCI_DID_INTEL_CNL_LP_PCIE_RP5, + PCI_DID_INTEL_CNL_LP_PCIE_RP6, + PCI_DID_INTEL_CNL_LP_PCIE_RP7, + PCI_DID_INTEL_CNL_LP_PCIE_RP8, + PCI_DID_INTEL_CNL_LP_PCIE_RP9, + PCI_DID_INTEL_CNL_LP_PCIE_RP10, + PCI_DID_INTEL_CNL_LP_PCIE_RP11, + PCI_DID_INTEL_CNL_LP_PCIE_RP12, + PCI_DID_INTEL_CNL_LP_PCIE_RP13, + PCI_DID_INTEL_CNL_LP_PCIE_RP14, + PCI_DID_INTEL_CNL_LP_PCIE_RP15, + PCI_DID_INTEL_CNL_LP_PCIE_RP16, + PCI_DID_INTEL_CNP_H_PCIE_RP1, + PCI_DID_INTEL_CNP_H_PCIE_RP2, + PCI_DID_INTEL_CNP_H_PCIE_RP3, + PCI_DID_INTEL_CNP_H_PCIE_RP4, + PCI_DID_INTEL_CNP_H_PCIE_RP5, + PCI_DID_INTEL_CNP_H_PCIE_RP6, + PCI_DID_INTEL_CNP_H_PCIE_RP7, + PCI_DID_INTEL_CNP_H_PCIE_RP8, + PCI_DID_INTEL_CNP_H_PCIE_RP9, + PCI_DID_INTEL_CNP_H_PCIE_RP10, + PCI_DID_INTEL_CNP_H_PCIE_RP11, + PCI_DID_INTEL_CNP_H_PCIE_RP12, + PCI_DID_INTEL_CNP_H_PCIE_RP13, + PCI_DID_INTEL_CNP_H_PCIE_RP14, + PCI_DID_INTEL_CNP_H_PCIE_RP15, + PCI_DID_INTEL_CNP_H_PCIE_RP16, + PCI_DID_INTEL_CNP_H_PCIE_RP17, + PCI_DID_INTEL_CNP_H_PCIE_RP18, + PCI_DID_INTEL_CNP_H_PCIE_RP19, + PCI_DID_INTEL_CNP_H_PCIE_RP20, + PCI_DID_INTEL_CNP_H_PCIE_RP21, + PCI_DID_INTEL_CNP_H_PCIE_RP22, + PCI_DID_INTEL_CNP_H_PCIE_RP23, + PCI_DID_INTEL_CNP_H_PCIE_RP24, + PCI_DID_INTEL_ICP_LP_PCIE_RP1, + PCI_DID_INTEL_ICP_LP_PCIE_RP2, + PCI_DID_INTEL_ICP_LP_PCIE_RP3, + PCI_DID_INTEL_ICP_LP_PCIE_RP4, + PCI_DID_INTEL_ICP_LP_PCIE_RP5, + PCI_DID_INTEL_ICP_LP_PCIE_RP6, + PCI_DID_INTEL_ICP_LP_PCIE_RP7, + PCI_DID_INTEL_ICP_LP_PCIE_RP8, + PCI_DID_INTEL_ICP_LP_PCIE_RP9, + PCI_DID_INTEL_ICP_LP_PCIE_RP10, + PCI_DID_INTEL_ICP_LP_PCIE_RP11, + PCI_DID_INTEL_ICP_LP_PCIE_RP12, + PCI_DID_INTEL_ICP_LP_PCIE_RP13, + PCI_DID_INTEL_ICP_LP_PCIE_RP14, + PCI_DID_INTEL_ICP_LP_PCIE_RP15, + PCI_DID_INTEL_ICP_LP_PCIE_RP16, + PCI_DID_INTEL_CMP_LP_PCIE_RP1, + PCI_DID_INTEL_CMP_LP_PCIE_RP2, + PCI_DID_INTEL_CMP_LP_PCIE_RP3, + PCI_DID_INTEL_CMP_LP_PCIE_RP4, + PCI_DID_INTEL_CMP_LP_PCIE_RP5, + PCI_DID_INTEL_CMP_LP_PCIE_RP6, + PCI_DID_INTEL_CMP_LP_PCIE_RP7, + PCI_DID_INTEL_CMP_LP_PCIE_RP8, + PCI_DID_INTEL_CMP_LP_PCIE_RP9, + PCI_DID_INTEL_CMP_LP_PCIE_RP10, + PCI_DID_INTEL_CMP_LP_PCIE_RP11, + PCI_DID_INTEL_CMP_LP_PCIE_RP12, + PCI_DID_INTEL_CMP_LP_PCIE_RP13, + PCI_DID_INTEL_CMP_LP_PCIE_RP14, + PCI_DID_INTEL_CMP_LP_PCIE_RP15, + PCI_DID_INTEL_CMP_LP_PCIE_RP16, + PCI_DID_INTEL_CMP_H_PCIE_RP1, + PCI_DID_INTEL_CMP_H_PCIE_RP2, + PCI_DID_INTEL_CMP_H_PCIE_RP3, + PCI_DID_INTEL_CMP_H_PCIE_RP4, + PCI_DID_INTEL_CMP_H_PCIE_RP5, + PCI_DID_INTEL_CMP_H_PCIE_RP6, + PCI_DID_INTEL_CMP_H_PCIE_RP7, + PCI_DID_INTEL_CMP_H_PCIE_RP8, + PCI_DID_INTEL_CMP_H_PCIE_RP9, + PCI_DID_INTEL_CMP_H_PCIE_RP10, + PCI_DID_INTEL_CMP_H_PCIE_RP11, + PCI_DID_INTEL_CMP_H_PCIE_RP12, + PCI_DID_INTEL_CMP_H_PCIE_RP13, + PCI_DID_INTEL_CMP_H_PCIE_RP14, + PCI_DID_INTEL_CMP_H_PCIE_RP15, + PCI_DID_INTEL_CMP_H_PCIE_RP16, + PCI_DID_INTEL_CMP_H_PCIE_RP17, + PCI_DID_INTEL_CMP_H_PCIE_RP18, + PCI_DID_INTEL_CMP_H_PCIE_RP19, + PCI_DID_INTEL_CMP_H_PCIE_RP20, + PCI_DID_INTEL_CMP_H_PCIE_RP21, + PCI_DID_INTEL_CMP_H_PCIE_RP22, + PCI_DID_INTEL_CMP_H_PCIE_RP23, + PCI_DID_INTEL_CMP_H_PCIE_RP24, + PCI_DID_INTEL_TGP_LP_PCIE_RP1, + PCI_DID_INTEL_TGP_LP_PCIE_RP2, + PCI_DID_INTEL_TGP_LP_PCIE_RP3, + PCI_DID_INTEL_TGP_LP_PCIE_RP4, + PCI_DID_INTEL_TGP_LP_PCIE_RP5, + PCI_DID_INTEL_TGP_LP_PCIE_RP6, + PCI_DID_INTEL_TGP_LP_PCIE_RP7, + PCI_DID_INTEL_TGP_LP_PCIE_RP8, + PCI_DID_INTEL_TGP_LP_PCIE_RP9, + PCI_DID_INTEL_TGP_LP_PCIE_RP10, + PCI_DID_INTEL_TGP_LP_PCIE_RP11, + PCI_DID_INTEL_TGP_LP_PCIE_RP12, + PCI_DID_INTEL_TGP_LP_PCIE_RP13, + PCI_DID_INTEL_TGP_LP_PCIE_RP14, + PCI_DID_INTEL_TGP_LP_PCIE_RP15, + PCI_DID_INTEL_TGP_LP_PCIE_RP16, + PCI_DID_INTEL_TGP_H_PCIE_RP1, + PCI_DID_INTEL_TGP_H_PCIE_RP2, + PCI_DID_INTEL_TGP_H_PCIE_RP3, + PCI_DID_INTEL_TGP_H_PCIE_RP4, + PCI_DID_INTEL_TGP_H_PCIE_RP5, + PCI_DID_INTEL_TGP_H_PCIE_RP6, + PCI_DID_INTEL_TGP_H_PCIE_RP7, + PCI_DID_INTEL_TGP_H_PCIE_RP8, + PCI_DID_INTEL_TGP_H_PCIE_RP9, + PCI_DID_INTEL_TGP_H_PCIE_RP10, + PCI_DID_INTEL_TGP_H_PCIE_RP11, + PCI_DID_INTEL_TGP_H_PCIE_RP12, + PCI_DID_INTEL_TGP_H_PCIE_RP13, + PCI_DID_INTEL_TGP_H_PCIE_RP14, + PCI_DID_INTEL_TGP_H_PCIE_RP15, + PCI_DID_INTEL_TGP_H_PCIE_RP16, + PCI_DID_INTEL_TGP_H_PCIE_RP17, + PCI_DID_INTEL_TGP_H_PCIE_RP18, + PCI_DID_INTEL_TGP_H_PCIE_RP19, + PCI_DID_INTEL_TGP_H_PCIE_RP20, + PCI_DID_INTEL_TGP_H_PCIE_RP21, + PCI_DID_INTEL_TGP_H_PCIE_RP22, + PCI_DID_INTEL_TGP_H_PCIE_RP23, + PCI_DID_INTEL_TGP_H_PCIE_RP24, + PCI_DID_INTEL_MCC_PCIE_RP1, + PCI_DID_INTEL_MCC_PCIE_RP2, + PCI_DID_INTEL_MCC_PCIE_RP3, + PCI_DID_INTEL_MCC_PCIE_RP4, + PCI_DID_INTEL_MCC_PCIE_RP5, + PCI_DID_INTEL_MCC_PCIE_RP6, + PCI_DID_INTEL_MCC_PCIE_RP7, + PCI_DID_INTEL_JSP_PCIE_RP1, + PCI_DID_INTEL_JSP_PCIE_RP2, + PCI_DID_INTEL_JSP_PCIE_RP3, + PCI_DID_INTEL_JSP_PCIE_RP4, + PCI_DID_INTEL_JSP_PCIE_RP5, + PCI_DID_INTEL_JSP_PCIE_RP6, + PCI_DID_INTEL_JSP_PCIE_RP7, + PCI_DID_INTEL_JSP_PCIE_RP8, + PCI_DID_INTEL_ADL_P_PCIE_RP1, + PCI_DID_INTEL_ADL_P_PCIE_RP2, + PCI_DID_INTEL_ADL_P_PCIE_RP3, + PCI_DID_INTEL_ADP_P_PCIE_RP1, + PCI_DID_INTEL_ADP_P_PCIE_RP2, + PCI_DID_INTEL_ADP_P_PCIE_RP3, + PCI_DID_INTEL_ADP_P_PCIE_RP4, + PCI_DID_INTEL_ADP_P_PCIE_RP5, + PCI_DID_INTEL_ADP_P_PCIE_RP6, + PCI_DID_INTEL_ADP_P_PCIE_RP7, + PCI_DID_INTEL_ADP_P_PCIE_RP8, + PCI_DID_INTEL_ADP_P_PCIE_RP9, + PCI_DID_INTEL_ADP_P_PCIE_RP10, + PCI_DID_INTEL_ADP_P_PCIE_RP11, + PCI_DID_INTEL_ADP_P_PCIE_RP12, + PCI_DID_INTEL_ADP_S_PCIE_RP1, + PCI_DID_INTEL_ADP_S_PCIE_RP2, + PCI_DID_INTEL_ADP_S_PCIE_RP3, + PCI_DID_INTEL_ADP_S_PCIE_RP4, + PCI_DID_INTEL_ADP_S_PCIE_RP5, + PCI_DID_INTEL_ADP_S_PCIE_RP6, + PCI_DID_INTEL_ADP_S_PCIE_RP7, + PCI_DID_INTEL_ADP_S_PCIE_RP8, + PCI_DID_INTEL_ADP_S_PCIE_RP9, + PCI_DID_INTEL_ADP_S_PCIE_RP10, + PCI_DID_INTEL_ADP_S_PCIE_RP11, + PCI_DID_INTEL_ADP_S_PCIE_RP12, + PCI_DID_INTEL_ADP_S_PCIE_RP13, + PCI_DID_INTEL_ADP_S_PCIE_RP14, + PCI_DID_INTEL_ADP_S_PCIE_RP15, + PCI_DID_INTEL_ADP_S_PCIE_RP16, + PCI_DID_INTEL_ADP_S_PCIE_RP17, + PCI_DID_INTEL_ADP_S_PCIE_RP18, + PCI_DID_INTEL_ADP_S_PCIE_RP19, + PCI_DID_INTEL_ADP_S_PCIE_RP20, + PCI_DID_INTEL_ADP_S_PCIE_RP21, + PCI_DID_INTEL_ADP_S_PCIE_RP22, + PCI_DID_INTEL_ADP_S_PCIE_RP23, + PCI_DID_INTEL_ADP_S_PCIE_RP24, + PCI_DID_INTEL_ADP_S_PCIE_RP25, + PCI_DID_INTEL_ADP_S_PCIE_RP26, + PCI_DID_INTEL_ADP_S_PCIE_RP27, + PCI_DID_INTEL_ADP_S_PCIE_RP28, + PCI_DID_INTEL_ADP_M_N_PCIE_RP1, + PCI_DID_INTEL_ADP_M_N_PCIE_RP2, + PCI_DID_INTEL_ADP_M_N_PCIE_RP3, + PCI_DID_INTEL_ADP_M_N_PCIE_RP4, + PCI_DID_INTEL_ADP_M_PCIE_RP5, + PCI_DID_INTEL_ADP_M_PCIE_RP6, + PCI_DID_INTEL_ADP_M_N_PCIE_RP7, + PCI_DID_INTEL_ADP_M_PCIE_RP8, + PCI_DID_INTEL_ADP_M_N_PCIE_RP9, + PCI_DID_INTEL_ADP_M_N_PCIE_RP10, + PCI_DID_INTEL_ADP_N_PCIE_RP11, + PCI_DID_INTEL_ADP_N_PCIE_RP12, 0 }; static const struct pci_driver pch_pcie __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pcie_device_ids, }; diff --git a/src/soc/intel/common/block/pmc/pmc.c b/src/soc/intel/common/block/pmc/pmc.c index b64841d616..105d92c5f4 100644 --- a/src/soc/intel/common/block/pmc/pmc.c +++ b/src/soc/intel/common/block/pmc/pmc.c @@ -111,30 +111,30 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_DNV_PMC, - PCI_DEVICE_ID_INTEL_SPT_LP_PMC, - PCI_DEVICE_ID_INTEL_SPT_H_PMC, - PCI_DEVICE_ID_INTEL_LWB_PMC, - PCI_DEVICE_ID_INTEL_LWB_PMC_SUPER, - PCI_DEVICE_ID_INTEL_UPT_H_PMC, - PCI_DEVICE_ID_INTEL_APL_PMC, - PCI_DEVICE_ID_INTEL_GLK_PMC, - PCI_DEVICE_ID_INTEL_CNP_H_PMC, - PCI_DEVICE_ID_INTEL_ICP_PMC, - PCI_DEVICE_ID_INTEL_CMP_PMC, - PCI_DEVICE_ID_INTEL_CMP_H_PMC, - PCI_DEVICE_ID_INTEL_TGP_PMC, - PCI_DEVICE_ID_INTEL_TGP_H_PMC, - PCI_DEVICE_ID_INTEL_MCC_PMC, - PCI_DEVICE_ID_INTEL_JSP_PMC, - PCI_DEVICE_ID_INTEL_ADP_P_PMC, - PCI_DEVICE_ID_INTEL_ADP_S_PMC, - PCI_DEVICE_ID_INTEL_ADP_M_N_PMC, + PCI_DID_INTEL_DNV_PMC, + PCI_DID_INTEL_SPT_LP_PMC, + PCI_DID_INTEL_SPT_H_PMC, + PCI_DID_INTEL_LWB_PMC, + PCI_DID_INTEL_LWB_PMC_SUPER, + PCI_DID_INTEL_UPT_H_PMC, + PCI_DID_INTEL_APL_PMC, + PCI_DID_INTEL_GLK_PMC, + PCI_DID_INTEL_CNP_H_PMC, + PCI_DID_INTEL_ICP_PMC, + PCI_DID_INTEL_CMP_PMC, + PCI_DID_INTEL_CMP_H_PMC, + PCI_DID_INTEL_TGP_PMC, + PCI_DID_INTEL_TGP_H_PMC, + PCI_DID_INTEL_MCC_PMC, + PCI_DID_INTEL_JSP_PMC, + PCI_DID_INTEL_ADP_P_PMC, + PCI_DID_INTEL_ADP_S_PMC, + PCI_DID_INTEL_ADP_M_N_PMC, 0 }; static const struct pci_driver pch_pmc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/sata/sata.c b/src/soc/intel/common/block/sata/sata.c index 08c1bbb1fe..fa937f4fd5 100644 --- a/src/soc/intel/common/block/sata/sata.c +++ b/src/soc/intel/common/block/sata/sata.c @@ -13,62 +13,62 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_U_SATA, - PCI_DEVICE_ID_INTEL_SPT_U_Y_PREMIUM_SATA, - PCI_DEVICE_ID_INTEL_SPT_KBL_SATA, - PCI_DEVICE_ID_INTEL_LWB_SATA_AHCI, - PCI_DEVICE_ID_INTEL_LWB_SSATA_AHCI, - PCI_DEVICE_ID_INTEL_LWB_SATA_RAID, - PCI_DEVICE_ID_INTEL_LWB_SSATA_RAID, - PCI_DEVICE_ID_INTEL_LWB_SATA_AHCI_SUPER, - PCI_DEVICE_ID_INTEL_LWB_SSATA_AHCI_SUPER, - PCI_DEVICE_ID_INTEL_LWB_SATA_RAID_SUPER, - PCI_DEVICE_ID_INTEL_LWB_SSATA_RAID_SUPER, - PCI_DEVICE_ID_INTEL_LWB_SATA_ALT, - PCI_DEVICE_ID_INTEL_LWB_SATA_ALT_RST, - PCI_DEVICE_ID_INTEL_LWB_SSATA_ALT, - PCI_DEVICE_ID_INTEL_LWB_SSATA_ALT_RST, - PCI_DEVICE_ID_INTEL_CNL_SATA, - PCI_DEVICE_ID_INTEL_CNL_PREMIUM_SATA, - PCI_DEVICE_ID_INTEL_CNP_CMP_COMPAT_SATA, - PCI_DEVICE_ID_INTEL_CNP_H_SATA, - PCI_DEVICE_ID_INTEL_CNP_H_HALO_SATA, - PCI_DEVICE_ID_INTEL_CNP_LP_SATA, - PCI_DEVICE_ID_INTEL_ICP_U_SATA, - PCI_DEVICE_ID_INTEL_CMP_SATA, - PCI_DEVICE_ID_INTEL_CMP_PREMIUM_SATA, - PCI_DEVICE_ID_INTEL_CMP_LP_SATA, - PCI_DEVICE_ID_INTEL_CMP_H_SATA, - PCI_DEVICE_ID_INTEL_CMP_H_HALO_SATA, - PCI_DEVICE_ID_INTEL_CMP_H_PREMIUM_SATA, - PCI_DEVICE_ID_INTEL_TGP_LP_SATA, - PCI_DEVICE_ID_INTEL_TGP_SATA, - PCI_DEVICE_ID_INTEL_TGP_PREMIUM_SATA, - PCI_DEVICE_ID_INTEL_TGP_COMPAT_SATA, - PCI_DEVICE_ID_INTEL_TGP_H_SATA, - PCI_DEVICE_ID_INTEL_MCC_AHCI_SATA, - PCI_DEVICE_ID_INTEL_JSP_SATA_1, - PCI_DEVICE_ID_INTEL_JSP_SATA_2, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_1, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_2, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_3, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_4, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_5, - PCI_DEVICE_ID_INTEL_ADP_P_SATA_6, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_1, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_2, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_3, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_4, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_5, - PCI_DEVICE_ID_INTEL_ADP_S_SATA_6, - PCI_DEVICE_ID_INTEL_ADP_M_SATA_1, - PCI_DEVICE_ID_INTEL_ADP_M_SATA_2, - PCI_DEVICE_ID_INTEL_ADP_M_SATA_3, + PCI_DID_INTEL_SPT_U_SATA, + PCI_DID_INTEL_SPT_U_Y_PREMIUM_SATA, + PCI_DID_INTEL_SPT_KBL_SATA, + PCI_DID_INTEL_LWB_SATA_AHCI, + PCI_DID_INTEL_LWB_SSATA_AHCI, + PCI_DID_INTEL_LWB_SATA_RAID, + PCI_DID_INTEL_LWB_SSATA_RAID, + PCI_DID_INTEL_LWB_SATA_AHCI_SUPER, + PCI_DID_INTEL_LWB_SSATA_AHCI_SUPER, + PCI_DID_INTEL_LWB_SATA_RAID_SUPER, + PCI_DID_INTEL_LWB_SSATA_RAID_SUPER, + PCI_DID_INTEL_LWB_SATA_ALT, + PCI_DID_INTEL_LWB_SATA_ALT_RST, + PCI_DID_INTEL_LWB_SSATA_ALT, + PCI_DID_INTEL_LWB_SSATA_ALT_RST, + PCI_DID_INTEL_CNL_SATA, + PCI_DID_INTEL_CNL_PREMIUM_SATA, + PCI_DID_INTEL_CNP_CMP_COMPAT_SATA, + PCI_DID_INTEL_CNP_H_SATA, + PCI_DID_INTEL_CNP_H_HALO_SATA, + PCI_DID_INTEL_CNP_LP_SATA, + PCI_DID_INTEL_ICP_U_SATA, + PCI_DID_INTEL_CMP_SATA, + PCI_DID_INTEL_CMP_PREMIUM_SATA, + PCI_DID_INTEL_CMP_LP_SATA, + PCI_DID_INTEL_CMP_H_SATA, + PCI_DID_INTEL_CMP_H_HALO_SATA, + PCI_DID_INTEL_CMP_H_PREMIUM_SATA, + PCI_DID_INTEL_TGP_LP_SATA, + PCI_DID_INTEL_TGP_SATA, + PCI_DID_INTEL_TGP_PREMIUM_SATA, + PCI_DID_INTEL_TGP_COMPAT_SATA, + PCI_DID_INTEL_TGP_H_SATA, + PCI_DID_INTEL_MCC_AHCI_SATA, + PCI_DID_INTEL_JSP_SATA_1, + PCI_DID_INTEL_JSP_SATA_2, + PCI_DID_INTEL_ADP_P_SATA_1, + PCI_DID_INTEL_ADP_P_SATA_2, + PCI_DID_INTEL_ADP_P_SATA_3, + PCI_DID_INTEL_ADP_P_SATA_4, + PCI_DID_INTEL_ADP_P_SATA_5, + PCI_DID_INTEL_ADP_P_SATA_6, + PCI_DID_INTEL_ADP_S_SATA_1, + PCI_DID_INTEL_ADP_S_SATA_2, + PCI_DID_INTEL_ADP_S_SATA_3, + PCI_DID_INTEL_ADP_S_SATA_4, + PCI_DID_INTEL_ADP_S_SATA_5, + PCI_DID_INTEL_ADP_S_SATA_6, + PCI_DID_INTEL_ADP_M_SATA_1, + PCI_DID_INTEL_ADP_M_SATA_2, + PCI_DID_INTEL_ADP_M_SATA_3, 0 }; static const struct pci_driver pch_sata __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/scs/mmc.c b/src/soc/intel/common/block/scs/mmc.c index 7f5519aa1a..538f77f099 100644 --- a/src/soc/intel/common/block/scs/mmc.c +++ b/src/soc/intel/common/block/scs/mmc.c @@ -71,14 +71,14 @@ static struct device_operations dev_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_CMP_EMMC, - PCI_DEVICE_ID_INTEL_JSP_EMMC, - PCI_DEVICE_ID_INTEL_ADP_EMMC, + PCI_DID_INTEL_CMP_EMMC, + PCI_DID_INTEL_JSP_EMMC, + PCI_DID_INTEL_ADP_EMMC, 0 }; static const struct pci_driver pch_sd __pci_driver = { .ops = &dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c index be59a3db72..11a4a94417 100644 --- a/src/soc/intel/common/block/scs/sd.c +++ b/src/soc/intel/common/block/scs/sd.c @@ -49,21 +49,21 @@ static struct device_operations dev_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_SD, - PCI_DEVICE_ID_INTEL_CNL_SD, - PCI_DEVICE_ID_INTEL_GLK_SD, - PCI_DEVICE_ID_INTEL_SKL_SD, - PCI_DEVICE_ID_INTEL_CNP_H_SD, - PCI_DEVICE_ID_INTEL_ICL_SD, - PCI_DEVICE_ID_INTEL_CMP_SD, - PCI_DEVICE_ID_INTEL_CMP_H_SD, - PCI_DEVICE_ID_INTEL_MCC_SD, - PCI_DEVICE_ID_INTEL_JSP_SD, + PCI_DID_INTEL_APL_SD, + PCI_DID_INTEL_CNL_SD, + PCI_DID_INTEL_GLK_SD, + PCI_DID_INTEL_SKL_SD, + PCI_DID_INTEL_CNP_H_SD, + PCI_DID_INTEL_ICL_SD, + PCI_DID_INTEL_CMP_SD, + PCI_DID_INTEL_CMP_H_SD, + PCI_DID_INTEL_MCC_SD, + PCI_DID_INTEL_JSP_SD, 0 }; static const struct pci_driver pch_sd __pci_driver = { .ops = &dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids }; diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c index 94a54b7b7f..2b135c75e8 100644 --- a/src/soc/intel/common/block/smbus/smbus.c +++ b/src/soc/intel/common/block/smbus/smbus.c @@ -74,29 +74,29 @@ static struct device_operations smbus_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_SMBUS, - PCI_DEVICE_ID_INTEL_CNL_SMBUS, - PCI_DEVICE_ID_INTEL_CNP_H_SMBUS, - PCI_DEVICE_ID_INTEL_SPT_LP_SMBUS, - PCI_DEVICE_ID_INTEL_SPT_H_SMBUS, - PCI_DEVICE_ID_INTEL_LWB_SMBUS_SUPER, - PCI_DEVICE_ID_INTEL_LWB_SMBUS, - PCI_DEVICE_ID_INTEL_ICP_LP_SMBUS, - PCI_DEVICE_ID_INTEL_CMP_SMBUS, - PCI_DEVICE_ID_INTEL_CMP_H_SMBUS, - PCI_DEVICE_ID_INTEL_TGP_LP_SMBUS, - PCI_DEVICE_ID_INTEL_TGP_H_SMBUS, - PCI_DEVICE_ID_INTEL_MCC_SMBUS, - PCI_DEVICE_ID_INTEL_JSP_SMBUS, - PCI_DEVICE_ID_INTEL_ADP_P_SMBUS, - PCI_DEVICE_ID_INTEL_ADP_S_SMBUS, - PCI_DEVICE_ID_INTEL_ADP_M_N_SMBUS, - PCI_DEVICE_ID_INTEL_DNV_SMBUS_LEGACY, + PCI_DID_INTEL_APL_SMBUS, + PCI_DID_INTEL_CNL_SMBUS, + PCI_DID_INTEL_CNP_H_SMBUS, + PCI_DID_INTEL_SPT_LP_SMBUS, + PCI_DID_INTEL_SPT_H_SMBUS, + PCI_DID_INTEL_LWB_SMBUS_SUPER, + PCI_DID_INTEL_LWB_SMBUS, + PCI_DID_INTEL_ICP_LP_SMBUS, + PCI_DID_INTEL_CMP_SMBUS, + PCI_DID_INTEL_CMP_H_SMBUS, + PCI_DID_INTEL_TGP_LP_SMBUS, + PCI_DID_INTEL_TGP_H_SMBUS, + PCI_DID_INTEL_MCC_SMBUS, + PCI_DID_INTEL_JSP_SMBUS, + PCI_DID_INTEL_ADP_P_SMBUS, + PCI_DID_INTEL_ADP_S_SMBUS, + PCI_DID_INTEL_ADP_M_N_SMBUS, + PCI_DID_INTEL_DNV_SMBUS_LEGACY, 0 }; static const struct pci_driver pch_smbus __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c index 33d62c1975..914809951c 100644 --- a/src/soc/intel/common/block/spi/spi.c +++ b/src/soc/intel/common/block/spi/spi.c @@ -39,85 +39,85 @@ static struct device_operations spi_dev_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_SPI1, - PCI_DEVICE_ID_INTEL_SPT_SPI2, - PCI_DEVICE_ID_INTEL_SPT_SPI3, - PCI_DEVICE_ID_INTEL_APL_SPI0, - PCI_DEVICE_ID_INTEL_APL_SPI1, - PCI_DEVICE_ID_INTEL_APL_SPI2, - PCI_DEVICE_ID_INTEL_APL_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_GLK_SPI0, - PCI_DEVICE_ID_INTEL_GLK_SPI1, - PCI_DEVICE_ID_INTEL_GLK_SPI2, - PCI_DEVICE_ID_INTEL_CNL_SPI0, - PCI_DEVICE_ID_INTEL_CNL_SPI1, - PCI_DEVICE_ID_INTEL_CNL_SPI2, - PCI_DEVICE_ID_INTEL_CNL_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_CNP_H_SPI0, - PCI_DEVICE_ID_INTEL_CNP_H_SPI1, - PCI_DEVICE_ID_INTEL_CNP_H_SPI2, - PCI_DEVICE_ID_INTEL_CNP_H_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_LWB_SPI, - PCI_DEVICE_ID_INTEL_LWB_SPI_SUPER, - PCI_DEVICE_ID_INTEL_ICP_SPI0, - PCI_DEVICE_ID_INTEL_ICP_SPI1, - PCI_DEVICE_ID_INTEL_ICP_SPI2, - PCI_DEVICE_ID_INTEL_ICP_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_CMP_SPI0, - PCI_DEVICE_ID_INTEL_CMP_SPI1, - PCI_DEVICE_ID_INTEL_CMP_SPI2, - PCI_DEVICE_ID_INTEL_CMP_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_CMP_H_SPI0, - PCI_DEVICE_ID_INTEL_CMP_H_SPI1, - PCI_DEVICE_ID_INTEL_CMP_H_SPI2, - PCI_DEVICE_ID_INTEL_CMP_H_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_TGP_SPI0, - PCI_DEVICE_ID_INTEL_TGP_GSPI0, - PCI_DEVICE_ID_INTEL_TGP_GSPI1, - PCI_DEVICE_ID_INTEL_TGP_GSPI2, - PCI_DEVICE_ID_INTEL_TGP_GSPI3, - PCI_DEVICE_ID_INTEL_TGP_GSPI4, - PCI_DEVICE_ID_INTEL_TGP_GSPI5, - PCI_DEVICE_ID_INTEL_TGP_GSPI6, - PCI_DEVICE_ID_INTEL_TGP_H_SPI0, - PCI_DEVICE_ID_INTEL_TGP_H_GSPI0, - PCI_DEVICE_ID_INTEL_TGP_H_GSPI1, - PCI_DEVICE_ID_INTEL_TGP_H_GSPI2, - PCI_DEVICE_ID_INTEL_TGP_H_GSPI3, - PCI_DEVICE_ID_INTEL_MCC_SPI0, - PCI_DEVICE_ID_INTEL_MCC_GSPI0, - PCI_DEVICE_ID_INTEL_MCC_GSPI1, - PCI_DEVICE_ID_INTEL_MCC_GSPI2, - PCI_DEVICE_ID_INTEL_JSP_SPI0, - PCI_DEVICE_ID_INTEL_JSP_SPI1, - PCI_DEVICE_ID_INTEL_JSP_SPI2, - PCI_DEVICE_ID_INTEL_JSP_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_ADP_P_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_ADP_S_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_ADP_M_N_HWSEQ_SPI, - PCI_DEVICE_ID_INTEL_ADP_P_SPI0, - PCI_DEVICE_ID_INTEL_ADP_P_SPI1, - PCI_DEVICE_ID_INTEL_ADP_P_SPI2, - PCI_DEVICE_ID_INTEL_ADP_P_SPI3, - PCI_DEVICE_ID_INTEL_ADP_P_SPI4, - PCI_DEVICE_ID_INTEL_ADP_P_SPI5, - PCI_DEVICE_ID_INTEL_ADP_P_SPI6, - PCI_DEVICE_ID_INTEL_ADP_S_SPI0, - PCI_DEVICE_ID_INTEL_ADP_S_SPI1, - PCI_DEVICE_ID_INTEL_ADP_S_SPI2, - PCI_DEVICE_ID_INTEL_ADP_S_SPI3, - PCI_DEVICE_ID_INTEL_ADP_S_SPI4, - PCI_DEVICE_ID_INTEL_ADP_S_SPI5, - PCI_DEVICE_ID_INTEL_ADP_S_SPI6, - PCI_DEVICE_ID_INTEL_ADP_M_N_SPI0, - PCI_DEVICE_ID_INTEL_ADP_M_N_SPI1, - PCI_DEVICE_ID_INTEL_ADP_M_SPI2, - PCI_DEVICE_ID_INTEL_SPR_HWSEQ_SPI, + PCI_DID_INTEL_SPT_SPI1, + PCI_DID_INTEL_SPT_SPI2, + PCI_DID_INTEL_SPT_SPI3, + PCI_DID_INTEL_APL_SPI0, + PCI_DID_INTEL_APL_SPI1, + PCI_DID_INTEL_APL_SPI2, + PCI_DID_INTEL_APL_HWSEQ_SPI, + PCI_DID_INTEL_GLK_SPI0, + PCI_DID_INTEL_GLK_SPI1, + PCI_DID_INTEL_GLK_SPI2, + PCI_DID_INTEL_CNL_SPI0, + PCI_DID_INTEL_CNL_SPI1, + PCI_DID_INTEL_CNL_SPI2, + PCI_DID_INTEL_CNL_HWSEQ_SPI, + PCI_DID_INTEL_CNP_H_SPI0, + PCI_DID_INTEL_CNP_H_SPI1, + PCI_DID_INTEL_CNP_H_SPI2, + PCI_DID_INTEL_CNP_H_HWSEQ_SPI, + PCI_DID_INTEL_LWB_SPI, + PCI_DID_INTEL_LWB_SPI_SUPER, + PCI_DID_INTEL_ICP_SPI0, + PCI_DID_INTEL_ICP_SPI1, + PCI_DID_INTEL_ICP_SPI2, + PCI_DID_INTEL_ICP_HWSEQ_SPI, + PCI_DID_INTEL_CMP_SPI0, + PCI_DID_INTEL_CMP_SPI1, + PCI_DID_INTEL_CMP_SPI2, + PCI_DID_INTEL_CMP_HWSEQ_SPI, + PCI_DID_INTEL_CMP_H_SPI0, + PCI_DID_INTEL_CMP_H_SPI1, + PCI_DID_INTEL_CMP_H_SPI2, + PCI_DID_INTEL_CMP_H_HWSEQ_SPI, + PCI_DID_INTEL_TGP_SPI0, + PCI_DID_INTEL_TGP_GSPI0, + PCI_DID_INTEL_TGP_GSPI1, + PCI_DID_INTEL_TGP_GSPI2, + PCI_DID_INTEL_TGP_GSPI3, + PCI_DID_INTEL_TGP_GSPI4, + PCI_DID_INTEL_TGP_GSPI5, + PCI_DID_INTEL_TGP_GSPI6, + PCI_DID_INTEL_TGP_H_SPI0, + PCI_DID_INTEL_TGP_H_GSPI0, + PCI_DID_INTEL_TGP_H_GSPI1, + PCI_DID_INTEL_TGP_H_GSPI2, + PCI_DID_INTEL_TGP_H_GSPI3, + PCI_DID_INTEL_MCC_SPI0, + PCI_DID_INTEL_MCC_GSPI0, + PCI_DID_INTEL_MCC_GSPI1, + PCI_DID_INTEL_MCC_GSPI2, + PCI_DID_INTEL_JSP_SPI0, + PCI_DID_INTEL_JSP_SPI1, + PCI_DID_INTEL_JSP_SPI2, + PCI_DID_INTEL_JSP_HWSEQ_SPI, + PCI_DID_INTEL_ADP_P_HWSEQ_SPI, + PCI_DID_INTEL_ADP_S_HWSEQ_SPI, + PCI_DID_INTEL_ADP_M_N_HWSEQ_SPI, + PCI_DID_INTEL_ADP_P_SPI0, + PCI_DID_INTEL_ADP_P_SPI1, + PCI_DID_INTEL_ADP_P_SPI2, + PCI_DID_INTEL_ADP_P_SPI3, + PCI_DID_INTEL_ADP_P_SPI4, + PCI_DID_INTEL_ADP_P_SPI5, + PCI_DID_INTEL_ADP_P_SPI6, + PCI_DID_INTEL_ADP_S_SPI0, + PCI_DID_INTEL_ADP_S_SPI1, + PCI_DID_INTEL_ADP_S_SPI2, + PCI_DID_INTEL_ADP_S_SPI3, + PCI_DID_INTEL_ADP_S_SPI4, + PCI_DID_INTEL_ADP_S_SPI5, + PCI_DID_INTEL_ADP_S_SPI6, + PCI_DID_INTEL_ADP_M_N_SPI0, + PCI_DID_INTEL_ADP_M_N_SPI1, + PCI_DID_INTEL_ADP_M_SPI2, + PCI_DID_INTEL_SPR_HWSEQ_SPI, 0 }; static const struct pci_driver pch_spi __pci_driver = { .ops = &spi_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/sram/sram.c b/src/soc/intel/common/block/sram/sram.c index 1badb83daf..60e06dc368 100644 --- a/src/soc/intel/common/block/sram/sram.c +++ b/src/soc/intel/common/block/sram/sram.c @@ -33,23 +33,23 @@ static const struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_SRAM, - PCI_DEVICE_ID_INTEL_GLK_SRAM, - PCI_DEVICE_ID_INTEL_ICL_SRAM, - PCI_DEVICE_ID_INTEL_CMP_SRAM, - PCI_DEVICE_ID_INTEL_CMP_H_SRAM, - PCI_DEVICE_ID_INTEL_TGP_PMC_CRASHLOG_SRAM, - PCI_DEVICE_ID_INTEL_TGL_H_SRAM, - PCI_DEVICE_ID_INTEL_MCC_SRAM, - PCI_DEVICE_ID_INTEL_JSP_SRAM, - PCI_DEVICE_ID_INTEL_ADP_S_PMC_CRASHLOG_SRAM, - PCI_DEVICE_ID_INTEL_ADP_P_PMC_CRASHLOG_SRAM, - PCI_DEVICE_ID_INTEL_ADP_N_PMC_CRASHLOG_SRAM, + PCI_DID_INTEL_APL_SRAM, + PCI_DID_INTEL_GLK_SRAM, + PCI_DID_INTEL_ICL_SRAM, + PCI_DID_INTEL_CMP_SRAM, + PCI_DID_INTEL_CMP_H_SRAM, + PCI_DID_INTEL_TGP_PMC_CRASHLOG_SRAM, + PCI_DID_INTEL_TGL_H_SRAM, + PCI_DID_INTEL_MCC_SRAM, + PCI_DID_INTEL_JSP_SRAM, + PCI_DID_INTEL_ADP_S_PMC_CRASHLOG_SRAM, + PCI_DID_INTEL_ADP_P_PMC_CRASHLOG_SRAM, + PCI_DID_INTEL_ADP_N_PMC_CRASHLOG_SRAM, 0, }; static const struct pci_driver sram __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c index f50690ea79..3c068577d0 100644 --- a/src/soc/intel/common/block/systemagent/systemagent.c +++ b/src/soc/intel/common/block/systemagent/systemagent.c @@ -327,124 +327,124 @@ static struct device_operations systemagent_ops = { }; static const unsigned short systemagent_ids[] = { - PCI_DEVICE_ID_INTEL_GLK_NB, - PCI_DEVICE_ID_INTEL_APL_NB, - PCI_DEVICE_ID_INTEL_CNL_ID_U, - PCI_DEVICE_ID_INTEL_CNL_ID_Y, - PCI_DEVICE_ID_INTEL_SKL_ID_U, - PCI_DEVICE_ID_INTEL_SKL_ID_Y, - PCI_DEVICE_ID_INTEL_SKL_ID_ULX, - PCI_DEVICE_ID_INTEL_SKL_ID_H_4, - PCI_DEVICE_ID_INTEL_SKL_ID_H_2, - PCI_DEVICE_ID_INTEL_SKL_ID_S_2, - PCI_DEVICE_ID_INTEL_SKL_ID_S_4, - PCI_DEVICE_ID_INTEL_WHL_ID_W_2, - PCI_DEVICE_ID_INTEL_WHL_ID_W_4, - PCI_DEVICE_ID_INTEL_KBL_ID_S, - PCI_DEVICE_ID_INTEL_SKL_ID_H_EM, - PCI_DEVICE_ID_INTEL_KBL_ID_U, - PCI_DEVICE_ID_INTEL_KBL_ID_Y, - PCI_DEVICE_ID_INTEL_KBL_ID_H, - PCI_DEVICE_ID_INTEL_KBL_U_R, - PCI_DEVICE_ID_INTEL_KBL_ID_DT, - PCI_DEVICE_ID_INTEL_KBL_ID_DT_2, - PCI_DEVICE_ID_INTEL_CFL_ID_U, - PCI_DEVICE_ID_INTEL_CFL_ID_U_2, - PCI_DEVICE_ID_INTEL_CFL_ID_H, - PCI_DEVICE_ID_INTEL_CFL_ID_H_4, - PCI_DEVICE_ID_INTEL_CFL_ID_H_8, - PCI_DEVICE_ID_INTEL_CFL_ID_S, - PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_2, - PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_4, - PCI_DEVICE_ID_INTEL_CFL_ID_S_DT_8, - PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_4, - PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_6, - PCI_DEVICE_ID_INTEL_CFL_ID_S_WS_8, - PCI_DEVICE_ID_INTEL_CFL_ID_S_S_4, - PCI_DEVICE_ID_INTEL_CFL_ID_S_S_6, - PCI_DEVICE_ID_INTEL_CFL_ID_S_S_8, - PCI_DEVICE_ID_INTEL_ICL_ID_U, - PCI_DEVICE_ID_INTEL_ICL_ID_U_2_2, - PCI_DEVICE_ID_INTEL_ICL_ID_Y, - PCI_DEVICE_ID_INTEL_ICL_ID_Y_2, - PCI_DEVICE_ID_INTEL_CML_ULT, - PCI_DEVICE_ID_INTEL_CML_ULT_2_2, - PCI_DEVICE_ID_INTEL_CML_ULT_6_2, - PCI_DEVICE_ID_INTEL_CML_ULX, - PCI_DEVICE_ID_INTEL_CML_S, - PCI_DEVICE_ID_INTEL_CML_S_G0G1_P0P1_6_2, - PCI_DEVICE_ID_INTEL_CML_S_P0P1_8_2, - PCI_DEVICE_ID_INTEL_CML_S_P0P1_10_2, - PCI_DEVICE_ID_INTEL_CML_S_G0G1_4, - PCI_DEVICE_ID_INTEL_CML_S_G0G1_2, - PCI_DEVICE_ID_INTEL_CML_H, - PCI_DEVICE_ID_INTEL_CML_H_4_2, - PCI_DEVICE_ID_INTEL_CML_H_8_2, - PCI_DEVICE_ID_INTEL_TGL_ID_U_2_2, - PCI_DEVICE_ID_INTEL_TGL_ID_U_4_2, - PCI_DEVICE_ID_INTEL_TGL_ID_Y_2_2, - PCI_DEVICE_ID_INTEL_TGL_ID_Y_4_2, - PCI_DEVICE_ID_INTEL_TGL_ID_H_6_1, - PCI_DEVICE_ID_INTEL_TGL_ID_H_8_1, - PCI_DEVICE_ID_INTEL_EHL_ID_0, - PCI_DEVICE_ID_INTEL_EHL_ID_1, - PCI_DEVICE_ID_INTEL_EHL_ID_1A, - PCI_DEVICE_ID_INTEL_EHL_ID_2, - PCI_DEVICE_ID_INTEL_EHL_ID_2_1, - PCI_DEVICE_ID_INTEL_EHL_ID_3, - PCI_DEVICE_ID_INTEL_EHL_ID_3A, - PCI_DEVICE_ID_INTEL_EHL_ID_4, - PCI_DEVICE_ID_INTEL_EHL_ID_5, - PCI_DEVICE_ID_INTEL_EHL_ID_6, - PCI_DEVICE_ID_INTEL_EHL_ID_7, - PCI_DEVICE_ID_INTEL_EHL_ID_8, - PCI_DEVICE_ID_INTEL_EHL_ID_9, - PCI_DEVICE_ID_INTEL_EHL_ID_10, - PCI_DEVICE_ID_INTEL_EHL_ID_11, - PCI_DEVICE_ID_INTEL_EHL_ID_12, - PCI_DEVICE_ID_INTEL_EHL_ID_13, - PCI_DEVICE_ID_INTEL_EHL_ID_14, - PCI_DEVICE_ID_INTEL_EHL_ID_15, - PCI_DEVICE_ID_INTEL_JSL_ID_1, - PCI_DEVICE_ID_INTEL_JSL_ID_2, - PCI_DEVICE_ID_INTEL_JSL_ID_3, - PCI_DEVICE_ID_INTEL_JSL_ID_4, - PCI_DEVICE_ID_INTEL_JSL_ID_5, - PCI_DEVICE_ID_INTEL_ADL_S_ID_1, - PCI_DEVICE_ID_INTEL_ADL_S_ID_2, - PCI_DEVICE_ID_INTEL_ADL_S_ID_3, - PCI_DEVICE_ID_INTEL_ADL_S_ID_4, - PCI_DEVICE_ID_INTEL_ADL_S_ID_5, - PCI_DEVICE_ID_INTEL_ADL_S_ID_6, - PCI_DEVICE_ID_INTEL_ADL_S_ID_7, - PCI_DEVICE_ID_INTEL_ADL_S_ID_8, - PCI_DEVICE_ID_INTEL_ADL_S_ID_9, - PCI_DEVICE_ID_INTEL_ADL_S_ID_10, - PCI_DEVICE_ID_INTEL_ADL_S_ID_11, - PCI_DEVICE_ID_INTEL_ADL_S_ID_12, - PCI_DEVICE_ID_INTEL_ADL_S_ID_13, - PCI_DEVICE_ID_INTEL_ADL_S_ID_14, - PCI_DEVICE_ID_INTEL_ADL_S_ID_15, - PCI_DEVICE_ID_INTEL_ADL_P_ID_1, - PCI_DEVICE_ID_INTEL_ADL_P_ID_3, - PCI_DEVICE_ID_INTEL_ADL_P_ID_4, - PCI_DEVICE_ID_INTEL_ADL_P_ID_5, - PCI_DEVICE_ID_INTEL_ADL_P_ID_6, - PCI_DEVICE_ID_INTEL_ADL_P_ID_7, - PCI_DEVICE_ID_INTEL_ADL_P_ID_8, - PCI_DEVICE_ID_INTEL_ADL_P_ID_9, - PCI_DEVICE_ID_INTEL_ADL_P_ID_10, - PCI_DEVICE_ID_INTEL_ADL_M_ID_1, - PCI_DEVICE_ID_INTEL_ADL_M_ID_2, - PCI_DEVICE_ID_INTEL_ADL_N_ID_1, - PCI_DEVICE_ID_INTEL_ADL_N_ID_2, - PCI_DEVICE_ID_INTEL_ADL_N_ID_3, - PCI_DEVICE_ID_INTEL_ADL_N_ID_4, + PCI_DID_INTEL_GLK_NB, + PCI_DID_INTEL_APL_NB, + PCI_DID_INTEL_CNL_ID_U, + PCI_DID_INTEL_CNL_ID_Y, + PCI_DID_INTEL_SKL_ID_U, + PCI_DID_INTEL_SKL_ID_Y, + PCI_DID_INTEL_SKL_ID_ULX, + PCI_DID_INTEL_SKL_ID_H_4, + PCI_DID_INTEL_SKL_ID_H_2, + PCI_DID_INTEL_SKL_ID_S_2, + PCI_DID_INTEL_SKL_ID_S_4, + PCI_DID_INTEL_WHL_ID_W_2, + PCI_DID_INTEL_WHL_ID_W_4, + PCI_DID_INTEL_KBL_ID_S, + PCI_DID_INTEL_SKL_ID_H_EM, + PCI_DID_INTEL_KBL_ID_U, + PCI_DID_INTEL_KBL_ID_Y, + PCI_DID_INTEL_KBL_ID_H, + PCI_DID_INTEL_KBL_U_R, + PCI_DID_INTEL_KBL_ID_DT, + PCI_DID_INTEL_KBL_ID_DT_2, + PCI_DID_INTEL_CFL_ID_U, + PCI_DID_INTEL_CFL_ID_U_2, + PCI_DID_INTEL_CFL_ID_H, + PCI_DID_INTEL_CFL_ID_H_4, + PCI_DID_INTEL_CFL_ID_H_8, + PCI_DID_INTEL_CFL_ID_S, + PCI_DID_INTEL_CFL_ID_S_DT_2, + PCI_DID_INTEL_CFL_ID_S_DT_4, + PCI_DID_INTEL_CFL_ID_S_DT_8, + PCI_DID_INTEL_CFL_ID_S_WS_4, + PCI_DID_INTEL_CFL_ID_S_WS_6, + PCI_DID_INTEL_CFL_ID_S_WS_8, + PCI_DID_INTEL_CFL_ID_S_S_4, + PCI_DID_INTEL_CFL_ID_S_S_6, + PCI_DID_INTEL_CFL_ID_S_S_8, + PCI_DID_INTEL_ICL_ID_U, + PCI_DID_INTEL_ICL_ID_U_2_2, + PCI_DID_INTEL_ICL_ID_Y, + PCI_DID_INTEL_ICL_ID_Y_2, + PCI_DID_INTEL_CML_ULT, + PCI_DID_INTEL_CML_ULT_2_2, + PCI_DID_INTEL_CML_ULT_6_2, + PCI_DID_INTEL_CML_ULX, + PCI_DID_INTEL_CML_S, + PCI_DID_INTEL_CML_S_G0G1_P0P1_6_2, + PCI_DID_INTEL_CML_S_P0P1_8_2, + PCI_DID_INTEL_CML_S_P0P1_10_2, + PCI_DID_INTEL_CML_S_G0G1_4, + PCI_DID_INTEL_CML_S_G0G1_2, + PCI_DID_INTEL_CML_H, + PCI_DID_INTEL_CML_H_4_2, + PCI_DID_INTEL_CML_H_8_2, + PCI_DID_INTEL_TGL_ID_U_2_2, + PCI_DID_INTEL_TGL_ID_U_4_2, + PCI_DID_INTEL_TGL_ID_Y_2_2, + PCI_DID_INTEL_TGL_ID_Y_4_2, + PCI_DID_INTEL_TGL_ID_H_6_1, + PCI_DID_INTEL_TGL_ID_H_8_1, + PCI_DID_INTEL_EHL_ID_0, + PCI_DID_INTEL_EHL_ID_1, + PCI_DID_INTEL_EHL_ID_1A, + PCI_DID_INTEL_EHL_ID_2, + PCI_DID_INTEL_EHL_ID_2_1, + PCI_DID_INTEL_EHL_ID_3, + PCI_DID_INTEL_EHL_ID_3A, + PCI_DID_INTEL_EHL_ID_4, + PCI_DID_INTEL_EHL_ID_5, + PCI_DID_INTEL_EHL_ID_6, + PCI_DID_INTEL_EHL_ID_7, + PCI_DID_INTEL_EHL_ID_8, + PCI_DID_INTEL_EHL_ID_9, + PCI_DID_INTEL_EHL_ID_10, + PCI_DID_INTEL_EHL_ID_11, + PCI_DID_INTEL_EHL_ID_12, + PCI_DID_INTEL_EHL_ID_13, + PCI_DID_INTEL_EHL_ID_14, + PCI_DID_INTEL_EHL_ID_15, + PCI_DID_INTEL_JSL_ID_1, + PCI_DID_INTEL_JSL_ID_2, + PCI_DID_INTEL_JSL_ID_3, + PCI_DID_INTEL_JSL_ID_4, + PCI_DID_INTEL_JSL_ID_5, + PCI_DID_INTEL_ADL_S_ID_1, + PCI_DID_INTEL_ADL_S_ID_2, + PCI_DID_INTEL_ADL_S_ID_3, + PCI_DID_INTEL_ADL_S_ID_4, + PCI_DID_INTEL_ADL_S_ID_5, + PCI_DID_INTEL_ADL_S_ID_6, + PCI_DID_INTEL_ADL_S_ID_7, + PCI_DID_INTEL_ADL_S_ID_8, + PCI_DID_INTEL_ADL_S_ID_9, + PCI_DID_INTEL_ADL_S_ID_10, + PCI_DID_INTEL_ADL_S_ID_11, + PCI_DID_INTEL_ADL_S_ID_12, + PCI_DID_INTEL_ADL_S_ID_13, + PCI_DID_INTEL_ADL_S_ID_14, + PCI_DID_INTEL_ADL_S_ID_15, + PCI_DID_INTEL_ADL_P_ID_1, + PCI_DID_INTEL_ADL_P_ID_3, + PCI_DID_INTEL_ADL_P_ID_4, + PCI_DID_INTEL_ADL_P_ID_5, + PCI_DID_INTEL_ADL_P_ID_6, + PCI_DID_INTEL_ADL_P_ID_7, + PCI_DID_INTEL_ADL_P_ID_8, + PCI_DID_INTEL_ADL_P_ID_9, + PCI_DID_INTEL_ADL_P_ID_10, + PCI_DID_INTEL_ADL_M_ID_1, + PCI_DID_INTEL_ADL_M_ID_2, + PCI_DID_INTEL_ADL_N_ID_1, + PCI_DID_INTEL_ADL_N_ID_2, + PCI_DID_INTEL_ADL_N_ID_3, + PCI_DID_INTEL_ADL_N_ID_4, 0 }; static const struct pci_driver systemagent_driver __pci_driver = { .ops = &systemagent_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = systemagent_ids }; diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c index 2e70d05ba3..cd960f2ea9 100644 --- a/src/soc/intel/common/block/uart/uart.c +++ b/src/soc/intel/common/block/uart/uart.c @@ -271,34 +271,34 @@ static void uart_fill_ssdt(const struct device *dev) static const char *uart_acpi_hid(const struct device *dev) { switch (dev->device) { - case PCI_DEVICE_ID_INTEL_APL_UART0: + case PCI_DID_INTEL_APL_UART0: return "80865abc"; - case PCI_DEVICE_ID_INTEL_APL_UART1: + case PCI_DID_INTEL_APL_UART1: return "80865abe"; - case PCI_DEVICE_ID_INTEL_APL_UART2: + case PCI_DID_INTEL_APL_UART2: return "80865ac0"; - case PCI_DEVICE_ID_INTEL_GLK_UART0: + case PCI_DID_INTEL_GLK_UART0: return "808631bc"; - case PCI_DEVICE_ID_INTEL_GLK_UART1: + case PCI_DID_INTEL_GLK_UART1: return "808631be"; - case PCI_DEVICE_ID_INTEL_GLK_UART2: + case PCI_DID_INTEL_GLK_UART2: return "808631c0"; - case PCI_DEVICE_ID_INTEL_GLK_UART3: + case PCI_DID_INTEL_GLK_UART3: return "808631ee"; - case PCI_DEVICE_ID_INTEL_SPT_UART0: - case PCI_DEVICE_ID_INTEL_SPT_H_UART0: + case PCI_DID_INTEL_SPT_UART0: + case PCI_DID_INTEL_SPT_H_UART0: return "INT3448"; - case PCI_DEVICE_ID_INTEL_SPT_UART1: - case PCI_DEVICE_ID_INTEL_SPT_H_UART1: + case PCI_DID_INTEL_SPT_UART1: + case PCI_DID_INTEL_SPT_H_UART1: return "INT3449"; - case PCI_DEVICE_ID_INTEL_SPT_UART2: - case PCI_DEVICE_ID_INTEL_SPT_H_UART2: + case PCI_DID_INTEL_SPT_UART2: + case PCI_DID_INTEL_SPT_H_UART2: return "INT344A"; - case PCI_DEVICE_ID_INTEL_CNP_H_UART0: + case PCI_DID_INTEL_CNP_H_UART0: return "INT34B8"; - case PCI_DEVICE_ID_INTEL_CNP_H_UART1: + case PCI_DID_INTEL_CNP_H_UART1: return "INT34B9"; - case PCI_DEVICE_ID_INTEL_CNP_H_UART2: + case PCI_DID_INTEL_CNP_H_UART2: return "INT34BA"; default: return NULL; @@ -308,25 +308,25 @@ static const char *uart_acpi_hid(const struct device *dev) static const char *uart_acpi_name(const struct device *dev) { switch (dev->device) { - case PCI_DEVICE_ID_INTEL_APL_UART0: - case PCI_DEVICE_ID_INTEL_GLK_UART0: - case PCI_DEVICE_ID_INTEL_SPT_UART0: - case PCI_DEVICE_ID_INTEL_SPT_H_UART0: - case PCI_DEVICE_ID_INTEL_CNP_H_UART0: + case PCI_DID_INTEL_APL_UART0: + case PCI_DID_INTEL_GLK_UART0: + case PCI_DID_INTEL_SPT_UART0: + case PCI_DID_INTEL_SPT_H_UART0: + case PCI_DID_INTEL_CNP_H_UART0: return "UAR0"; - case PCI_DEVICE_ID_INTEL_APL_UART1: - case PCI_DEVICE_ID_INTEL_GLK_UART1: - case PCI_DEVICE_ID_INTEL_SPT_UART1: - case PCI_DEVICE_ID_INTEL_SPT_H_UART1: - case PCI_DEVICE_ID_INTEL_CNP_H_UART1: + case PCI_DID_INTEL_APL_UART1: + case PCI_DID_INTEL_GLK_UART1: + case PCI_DID_INTEL_SPT_UART1: + case PCI_DID_INTEL_SPT_H_UART1: + case PCI_DID_INTEL_CNP_H_UART1: return "UAR1"; - case PCI_DEVICE_ID_INTEL_APL_UART2: - case PCI_DEVICE_ID_INTEL_GLK_UART2: - case PCI_DEVICE_ID_INTEL_SPT_UART2: - case PCI_DEVICE_ID_INTEL_SPT_H_UART2: - case PCI_DEVICE_ID_INTEL_CNP_H_UART2: + case PCI_DID_INTEL_APL_UART2: + case PCI_DID_INTEL_GLK_UART2: + case PCI_DID_INTEL_SPT_UART2: + case PCI_DID_INTEL_SPT_H_UART2: + case PCI_DID_INTEL_CNP_H_UART2: return "UAR2"; - case PCI_DEVICE_ID_INTEL_GLK_UART3: + case PCI_DID_INTEL_GLK_UART3: return "UAR3"; default: return NULL; @@ -344,75 +344,75 @@ static struct device_operations device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_SPT_UART0, - PCI_DEVICE_ID_INTEL_SPT_UART1, - PCI_DEVICE_ID_INTEL_SPT_UART2, - PCI_DEVICE_ID_INTEL_SPT_H_UART0, - PCI_DEVICE_ID_INTEL_SPT_H_UART1, - PCI_DEVICE_ID_INTEL_SPT_H_UART2, - PCI_DEVICE_ID_INTEL_UPT_H_UART0, - PCI_DEVICE_ID_INTEL_UPT_H_UART1, - PCI_DEVICE_ID_INTEL_UPT_H_UART2, - PCI_DEVICE_ID_INTEL_APL_UART0, - PCI_DEVICE_ID_INTEL_APL_UART1, - PCI_DEVICE_ID_INTEL_APL_UART2, - PCI_DEVICE_ID_INTEL_APL_UART3, - PCI_DEVICE_ID_INTEL_CNL_UART0, - PCI_DEVICE_ID_INTEL_CNL_UART1, - PCI_DEVICE_ID_INTEL_CNL_UART2, - PCI_DEVICE_ID_INTEL_GLK_UART0, - PCI_DEVICE_ID_INTEL_GLK_UART1, - PCI_DEVICE_ID_INTEL_GLK_UART2, - PCI_DEVICE_ID_INTEL_GLK_UART3, - PCI_DEVICE_ID_INTEL_CNP_H_UART0, - PCI_DEVICE_ID_INTEL_CNP_H_UART1, - PCI_DEVICE_ID_INTEL_CNP_H_UART2, - PCI_DEVICE_ID_INTEL_ICP_UART0, - PCI_DEVICE_ID_INTEL_ICP_UART1, - PCI_DEVICE_ID_INTEL_ICP_UART2, - PCI_DEVICE_ID_INTEL_CMP_UART0, - PCI_DEVICE_ID_INTEL_CMP_UART1, - PCI_DEVICE_ID_INTEL_CMP_UART2, - PCI_DEVICE_ID_INTEL_CMP_H_UART0, - PCI_DEVICE_ID_INTEL_CMP_H_UART1, - PCI_DEVICE_ID_INTEL_CMP_H_UART2, - PCI_DEVICE_ID_INTEL_TGP_UART0, - PCI_DEVICE_ID_INTEL_TGP_UART1, - PCI_DEVICE_ID_INTEL_TGP_UART2, - PCI_DEVICE_ID_INTEL_TGP_H_UART0, - PCI_DEVICE_ID_INTEL_TGP_H_UART1, - PCI_DEVICE_ID_INTEL_TGP_H_UART2, - PCI_DEVICE_ID_INTEL_TGP_H_UART3, - PCI_DEVICE_ID_INTEL_MCC_UART0, - PCI_DEVICE_ID_INTEL_MCC_UART1, - PCI_DEVICE_ID_INTEL_MCC_UART2, - PCI_DEVICE_ID_INTEL_JSP_UART0, - PCI_DEVICE_ID_INTEL_JSP_UART1, - PCI_DEVICE_ID_INTEL_JSP_UART2, - PCI_DEVICE_ID_INTEL_ADP_S_UART0, - PCI_DEVICE_ID_INTEL_ADP_S_UART1, - PCI_DEVICE_ID_INTEL_ADP_S_UART2, - PCI_DEVICE_ID_INTEL_ADP_S_UART3, - PCI_DEVICE_ID_INTEL_ADP_S_UART4, - PCI_DEVICE_ID_INTEL_ADP_S_UART5, - PCI_DEVICE_ID_INTEL_ADP_S_UART6, - PCI_DEVICE_ID_INTEL_ADP_P_UART0, - PCI_DEVICE_ID_INTEL_ADP_P_UART1, - PCI_DEVICE_ID_INTEL_ADP_P_UART2, - PCI_DEVICE_ID_INTEL_ADP_P_UART3, - PCI_DEVICE_ID_INTEL_ADP_P_UART4, - PCI_DEVICE_ID_INTEL_ADP_P_UART5, - PCI_DEVICE_ID_INTEL_ADP_P_UART6, - PCI_DEVICE_ID_INTEL_ADP_M_N_UART0, - PCI_DEVICE_ID_INTEL_ADP_M_N_UART1, - PCI_DEVICE_ID_INTEL_ADP_M_N_UART2, - PCI_DEVICE_ID_INTEL_ADP_M_N_UART3, + PCI_DID_INTEL_SPT_UART0, + PCI_DID_INTEL_SPT_UART1, + PCI_DID_INTEL_SPT_UART2, + PCI_DID_INTEL_SPT_H_UART0, + PCI_DID_INTEL_SPT_H_UART1, + PCI_DID_INTEL_SPT_H_UART2, + PCI_DID_INTEL_UPT_H_UART0, + PCI_DID_INTEL_UPT_H_UART1, + PCI_DID_INTEL_UPT_H_UART2, + PCI_DID_INTEL_APL_UART0, + PCI_DID_INTEL_APL_UART1, + PCI_DID_INTEL_APL_UART2, + PCI_DID_INTEL_APL_UART3, + PCI_DID_INTEL_CNL_UART0, + PCI_DID_INTEL_CNL_UART1, + PCI_DID_INTEL_CNL_UART2, + PCI_DID_INTEL_GLK_UART0, + PCI_DID_INTEL_GLK_UART1, + PCI_DID_INTEL_GLK_UART2, + PCI_DID_INTEL_GLK_UART3, + PCI_DID_INTEL_CNP_H_UART0, + PCI_DID_INTEL_CNP_H_UART1, + PCI_DID_INTEL_CNP_H_UART2, + PCI_DID_INTEL_ICP_UART0, + PCI_DID_INTEL_ICP_UART1, + PCI_DID_INTEL_ICP_UART2, + PCI_DID_INTEL_CMP_UART0, + PCI_DID_INTEL_CMP_UART1, + PCI_DID_INTEL_CMP_UART2, + PCI_DID_INTEL_CMP_H_UART0, + PCI_DID_INTEL_CMP_H_UART1, + PCI_DID_INTEL_CMP_H_UART2, + PCI_DID_INTEL_TGP_UART0, + PCI_DID_INTEL_TGP_UART1, + PCI_DID_INTEL_TGP_UART2, + PCI_DID_INTEL_TGP_H_UART0, + PCI_DID_INTEL_TGP_H_UART1, + PCI_DID_INTEL_TGP_H_UART2, + PCI_DID_INTEL_TGP_H_UART3, + PCI_DID_INTEL_MCC_UART0, + PCI_DID_INTEL_MCC_UART1, + PCI_DID_INTEL_MCC_UART2, + PCI_DID_INTEL_JSP_UART0, + PCI_DID_INTEL_JSP_UART1, + PCI_DID_INTEL_JSP_UART2, + PCI_DID_INTEL_ADP_S_UART0, + PCI_DID_INTEL_ADP_S_UART1, + PCI_DID_INTEL_ADP_S_UART2, + PCI_DID_INTEL_ADP_S_UART3, + PCI_DID_INTEL_ADP_S_UART4, + PCI_DID_INTEL_ADP_S_UART5, + PCI_DID_INTEL_ADP_S_UART6, + PCI_DID_INTEL_ADP_P_UART0, + PCI_DID_INTEL_ADP_P_UART1, + PCI_DID_INTEL_ADP_P_UART2, + PCI_DID_INTEL_ADP_P_UART3, + PCI_DID_INTEL_ADP_P_UART4, + PCI_DID_INTEL_ADP_P_UART5, + PCI_DID_INTEL_ADP_P_UART6, + PCI_DID_INTEL_ADP_M_N_UART0, + PCI_DID_INTEL_ADP_M_N_UART1, + PCI_DID_INTEL_ADP_M_N_UART2, + PCI_DID_INTEL_ADP_M_N_UART3, 0, }; static const struct pci_driver pch_uart __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/usb4/usb4.c b/src/soc/intel/common/block/usb4/usb4.c index 0ec4d5fdf3..996e7f52ee 100644 --- a/src/soc/intel/common/block/usb4/usb4.c +++ b/src/soc/intel/common/block/usb4/usb4.c @@ -53,12 +53,12 @@ static void tbt_dma_fill_ssdt(const struct device *dev) #endif static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_TGL_TBT_DMA0, - PCI_DEVICE_ID_INTEL_TGL_TBT_DMA1, - PCI_DEVICE_ID_INTEL_TGL_H_TBT_DMA0, - PCI_DEVICE_ID_INTEL_TGL_H_TBT_DMA1, - PCI_DEVICE_ID_INTEL_ADL_TBT_DMA0, - PCI_DEVICE_ID_INTEL_ADL_TBT_DMA1, + PCI_DID_INTEL_TGL_TBT_DMA0, + PCI_DID_INTEL_TGL_TBT_DMA1, + PCI_DID_INTEL_TGL_H_TBT_DMA0, + PCI_DID_INTEL_TGL_H_TBT_DMA1, + PCI_DID_INTEL_ADL_TBT_DMA0, + PCI_DID_INTEL_ADL_TBT_DMA1, 0 }; @@ -76,6 +76,6 @@ static struct device_operations usb4_dev_ops = { static const struct pci_driver usb4_driver __pci_driver = { .ops = &usb4_dev_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/usb4/xhci.c b/src/soc/intel/common/block/usb4/xhci.c index d0be8e5f9f..ba6b83f1ac 100644 --- a/src/soc/intel/common/block/usb4/xhci.c +++ b/src/soc/intel/common/block/usb4/xhci.c @@ -26,14 +26,14 @@ static struct device_operations usb4_xhci_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_TGP_TCSS_XHCI, - PCI_DEVICE_ID_INTEL_TGP_H_TCSS_XHCI, - PCI_DEVICE_ID_INTEL_ADP_TCSS_XHCI, + PCI_DID_INTEL_TGP_TCSS_XHCI, + PCI_DID_INTEL_TGP_H_TCSS_XHCI, + PCI_DID_INTEL_ADP_TCSS_XHCI, 0 }; static const struct pci_driver usb4_xhci __pci_driver = { .ops = &usb4_xhci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c index 5322075d16..4b751aea24 100644 --- a/src/soc/intel/common/block/xdci/xdci.c +++ b/src/soc/intel/common/block/xdci/xdci.c @@ -27,26 +27,26 @@ static struct device_operations usb_xdci_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_XDCI, - PCI_DEVICE_ID_INTEL_CNL_LP_XDCI, - PCI_DEVICE_ID_INTEL_GLK_XDCI, - PCI_DEVICE_ID_INTEL_SPT_LP_XDCI, - PCI_DEVICE_ID_INTEL_CNP_H_XDCI, - PCI_DEVICE_ID_INTEL_ICP_LP_XDCI, - PCI_DEVICE_ID_INTEL_CMP_LP_XDCI, - PCI_DEVICE_ID_INTEL_CMP_H_XDCI, - PCI_DEVICE_ID_INTEL_TGP_LP_XDCI, - PCI_DEVICE_ID_INTEL_TGP_H_XDCI, - PCI_DEVICE_ID_INTEL_MCC_XDCI, - PCI_DEVICE_ID_INTEL_JSP_XDCI, - PCI_DEVICE_ID_INTEL_ADP_P_XDCI, - PCI_DEVICE_ID_INTEL_ADP_S_XDCI, - PCI_DEVICE_ID_INTEL_ADP_M_XDCI, + PCI_DID_INTEL_APL_XDCI, + PCI_DID_INTEL_CNL_LP_XDCI, + PCI_DID_INTEL_GLK_XDCI, + PCI_DID_INTEL_SPT_LP_XDCI, + PCI_DID_INTEL_CNP_H_XDCI, + PCI_DID_INTEL_ICP_LP_XDCI, + PCI_DID_INTEL_CMP_LP_XDCI, + PCI_DID_INTEL_CMP_H_XDCI, + PCI_DID_INTEL_TGP_LP_XDCI, + PCI_DID_INTEL_TGP_H_XDCI, + PCI_DID_INTEL_MCC_XDCI, + PCI_DID_INTEL_JSP_XDCI, + PCI_DID_INTEL_ADP_P_XDCI, + PCI_DID_INTEL_ADP_S_XDCI, + PCI_DID_INTEL_ADP_M_XDCI, 0 }; static const struct pci_driver pch_usb_xdci __pci_driver = { .ops = &usb_xdci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index 5b19fc9e36..353840a2ca 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -106,30 +106,30 @@ static struct device_operations usb_xhci_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_APL_XHCI, - PCI_DEVICE_ID_INTEL_CNL_LP_XHCI, - PCI_DEVICE_ID_INTEL_GLK_XHCI, - PCI_DEVICE_ID_INTEL_SPT_LP_XHCI, - PCI_DEVICE_ID_INTEL_SPT_H_XHCI, - PCI_DEVICE_ID_INTEL_LWB_XHCI, - PCI_DEVICE_ID_INTEL_LWB_XHCI_SUPER, - PCI_DEVICE_ID_INTEL_UPT_H_XHCI, - PCI_DEVICE_ID_INTEL_CNP_H_XHCI, - PCI_DEVICE_ID_INTEL_ICP_LP_XHCI, - PCI_DEVICE_ID_INTEL_CMP_LP_XHCI, - PCI_DEVICE_ID_INTEL_CMP_H_XHCI, - PCI_DEVICE_ID_INTEL_TGP_LP_XHCI, - PCI_DEVICE_ID_INTEL_TGP_H_XHCI, - PCI_DEVICE_ID_INTEL_MCC_XHCI, - PCI_DEVICE_ID_INTEL_JSP_XHCI, - PCI_DEVICE_ID_INTEL_ADP_P_XHCI, - PCI_DEVICE_ID_INTEL_ADP_S_XHCI, - PCI_DEVICE_ID_INTEL_ADP_M_XHCI, + PCI_DID_INTEL_APL_XHCI, + PCI_DID_INTEL_CNL_LP_XHCI, + PCI_DID_INTEL_GLK_XHCI, + PCI_DID_INTEL_SPT_LP_XHCI, + PCI_DID_INTEL_SPT_H_XHCI, + PCI_DID_INTEL_LWB_XHCI, + PCI_DID_INTEL_LWB_XHCI_SUPER, + PCI_DID_INTEL_UPT_H_XHCI, + PCI_DID_INTEL_CNP_H_XHCI, + PCI_DID_INTEL_ICP_LP_XHCI, + PCI_DID_INTEL_CMP_LP_XHCI, + PCI_DID_INTEL_CMP_H_XHCI, + PCI_DID_INTEL_TGP_LP_XHCI, + PCI_DID_INTEL_TGP_H_XHCI, + PCI_DID_INTEL_MCC_XHCI, + PCI_DID_INTEL_JSP_XHCI, + PCI_DID_INTEL_ADP_P_XHCI, + PCI_DID_INTEL_ADP_S_XHCI, + PCI_DID_INTEL_ADP_M_XHCI, 0 }; static const struct pci_driver pch_usb_xhci __pci_driver = { .ops = &usb_xhci_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; |