diff options
| author | Felix Singer <felixsinger@posteo.net> | 2022-03-07 04:34:52 +0100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-03-07 08:32:09 +0000 |
| commit | 43b7f416783ccc98952a4eb5f9274907442b03e5 (patch) | |
| tree | 86a45336e809bee5d2891f2be9cf00184da9bb18 /src/soc/amd/stoneyridge | |
| parent | 2c423441c054d7a8c93cc814b9db5f8f7185bd0f (diff) | |
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>
Diffstat (limited to 'src/soc/amd/stoneyridge')
| -rw-r--r-- | src/soc/amd/stoneyridge/include/soc/pci_devs.h | 12 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/northbridge.c | 6 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/usb.c | 14 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/soc/amd/stoneyridge/include/soc/pci_devs.h b/src/soc/amd/stoneyridge/include/soc/pci_devs.h index 4e5c8fc07c..e639fe6e16 100644 --- a/src/soc/amd/stoneyridge/include/soc/pci_devs.h +++ b/src/soc/amd/stoneyridge/include/soc/pci_devs.h @@ -21,8 +21,8 @@ /* * Internal Graphics * Device IDs subject to SKU/OPN variation - * GFX_DEVID for merlinfalcon PCI_DEVICE_ID_AMD_15H_MODEL_606F_GFX - * GFX_DEVID for stoneyridge PCI_DEVICE_ID_AMD_15H_MODEL_707F_GFX + * GFX_DEVID for merlinfalcon PCI_DID_AMD_15H_MODEL_606F_GFX + * GFX_DEVID for stoneyridge PCI_DID_AMD_15H_MODEL_707F_GFX */ #define GFX_DEV 0x1 #define GFX_FUNC 0 @@ -31,8 +31,8 @@ /* HD Audio 0 * Device IDs - * HDA0_DEVID PCI_DEVICE_ID_AMD_15H_MODEL_606F_HDA - * HDA0_DEVID PCI_DEVICE_ID_AMD_15H_MODEL_707F_HDA + * HDA0_DEVID PCI_DID_AMD_15H_MODEL_606F_HDA + * HDA0_DEVID PCI_DID_AMD_15H_MODEL_707F_HDA */ #define HDA0_DEV 0x1 #define HDA0_FUNC 1 @@ -89,8 +89,8 @@ /* HT Configuration * Device IDs - * HT_DEVID for merlinfalcon PCI_DEVICE_ID_AMD_15H_MODEL_606F_NB_HT - * HT_DEVID for stoneyridge PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_HT + * HT_DEVID for merlinfalcon PCI_DID_AMD_15H_MODEL_606F_NB_HT + * HT_DEVID for stoneyridge PCI_DID_AMD_15H_MODEL_707F_NB_HT */ #define HT_DEV 0x18 #define HT_FUNC 0 diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c index 85ef19ef4d..2166ef477f 100644 --- a/src/soc/amd/stoneyridge/northbridge.c +++ b/src/soc/amd/stoneyridge/northbridge.c @@ -320,13 +320,13 @@ static struct device_operations northbridge_operations = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_15H_MODEL_606F_NB_HT, - PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_HT, + PCI_DID_AMD_15H_MODEL_606F_NB_HT, + PCI_DID_AMD_15H_MODEL_707F_NB_HT, 0 }; static const struct pci_driver family15_northbridge __pci_driver = { .ops = &northbridge_operations, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/stoneyridge/usb.c b/src/soc/amd/stoneyridge/usb.c index c83f1e15d0..efb50cd6f7 100644 --- a/src/soc/amd/stoneyridge/usb.c +++ b/src/soc/amd/stoneyridge/usb.c @@ -52,17 +52,17 @@ static struct device_operations usb_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_USB_18_0, - PCI_DEVICE_ID_AMD_SB900_USB_18_2, - PCI_DEVICE_ID_AMD_SB900_USB_20_5, - PCI_DEVICE_ID_AMD_CZ_USB_0, - PCI_DEVICE_ID_AMD_CZ_USB_1, - PCI_DEVICE_ID_AMD_CZ_USB3_0, + PCI_DID_AMD_SB900_USB_18_0, + PCI_DID_AMD_SB900_USB_18_2, + PCI_DID_AMD_SB900_USB_20_5, + PCI_DID_AMD_CZ_USB_0, + PCI_DID_AMD_CZ_USB_1, + PCI_DID_AMD_CZ_USB3_0, 0 }; static const struct pci_driver usb_0_driver __pci_driver = { .ops = &usb_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; |