From 43b7f416783ccc98952a4eb5f9274907442b03e5 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 7 Mar 2022 04:34:52 +0100 Subject: src: Make PCI ID define names shorter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Shorten define names containing PCI_{DEVICE,VENDOR}_ID_ with PCI_{DID,VID}_ using the commands below, which also take care of some spacing issues. An additional clean up of pci_ids.h is done in CB:61531. Used commands: * find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]\{2\}\([_0-9A-Za-z]\{8\}\)*[_0-9A-Za-z]\{0,5\}\)\t/PCI_\1ID_\3\t\t/g' * find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]*\)/PCI_\1ID_\3/g' Change-Id: If9027700f53b6d0d3964c26a41a1f9b8f62be178 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/39331 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/soc/intel/common/block/i2c/i2c.c | 204 +++++++++++++++++------------------ 1 file changed, 102 insertions(+), 102 deletions(-) (limited to 'src/soc/intel/common/block/i2c') 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 -- cgit v1.2.3