src: Make PCI ID define names shorter
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 <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39331
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index c1d75e0..ba10b2c 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -175,113 +175,113 @@
};
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