sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src: Make PCI ID define names shorter

Browse Source 
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>
This commit is contained in:
Felix Singer
2022-03-07 04:34:52 +01:00
parent 2c423441c0
commit 43b7f41678
263 changed files with 6620 additions and 6622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/southbridge/amd/agesa/hudson/hda.c
View File

@@ -20,6 +20,6 @@ static struct device_operations hda_audio_ops = {
static const struct pci_driver hdaaudio_driver __pci_driver = {
.ops = &hda_audio_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_HDA,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_HDA,
};

7
src/southbridge/amd/agesa/hudson/hudson.c
View File

@@ -44,7 +44,7 @@ void hudson_enable(struct device *dev)
if (dev->enabled == 0) {
u32 usb_device_id = pci_read_config16(dev, PCI_DEVICE_ID);
u8 reg8;
if (usb_device_id == PCI_DEVICE_ID_AMD_SB900_USB_20_5) {
if (usb_device_id == PCI_DID_AMD_SB900_USB_20_5) {
/* turn off and remove device 0:14.5 from PCI space */
reg8 = pm_read8(0xef);
reg8 &= ~(1 << 6);
@@ -58,12 +58,11 @@ void hudson_enable(struct device *dev)
u32 sd_device_id = pci_read_config16(dev, PCI_DEVICE_ID);
/* turn off the SDHC controller in the PM reg */
u8 reg8;
if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) {
if (sd_device_id == PCI_DID_AMD_HUDSON_SD) {
reg8 = pm_read8(0xe7);
reg8 &= ~(1 << 0);
pm_write8(0xe7, reg8);
}
else if (sd_device_id == PCI_DEVICE_ID_AMD_YANGTZE_SD) {
} else if (sd_device_id == PCI_DID_AMD_YANGTZE_SD) {
reg8 = pm_read8(0xe8);
reg8 &= ~(1 << 0);
pm_write8(0xe8, reg8);

4
src/southbridge/amd/agesa/hudson/ide.c
View File

@@ -19,6 +19,6 @@ static struct device_operations ide_ops = {
static const struct pci_driver ide_driver __pci_driver = {
.ops = &ide_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_IDE,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_IDE,
};

4
src/southbridge/amd/agesa/hudson/lpc.c
View File

@@ -343,6 +343,6 @@ static struct device_operations lpc_ops = {
};
static const struct pci_driver lpc_driver __pci_driver = {
.ops = &lpc_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_LPC,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_LPC,
};

4
src/southbridge/amd/agesa/hudson/pci.c
View File

@@ -41,6 +41,6 @@ static struct device_operations pci_ops = {
static const struct pci_driver pci_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_PCI,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_PCI,
};

16
src/southbridge/amd/agesa/hudson/pcie.c
View File

@@ -25,22 +25,22 @@ static struct device_operations pci_ops = {
static const struct pci_driver pciea_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEA,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_PCIEA,
};
static const struct pci_driver pcieb_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEB,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_PCIEB,
};
static const struct pci_driver pciec_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEC,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_PCIEC,
};
static const struct pci_driver pcied_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_PCIED,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_PCIED,
};

8
src/southbridge/amd/agesa/hudson/sata.c
View File

@@ -53,12 +53,12 @@ static struct device_operations sata_ops = {
static const struct pci_driver sata0_driver __pci_driver = {
.ops = &sata_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_SATA,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_SATA,
};
static const struct pci_driver sata0_driver_ahci __pci_driver = {
.ops = &sata_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_SATA_AHCI,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_SATA_AHCI,
};

4
src/southbridge/amd/agesa/hudson/sd.c
View File

@@ -46,6 +46,6 @@ static struct device_operations sd_ops = {
static const struct pci_driver sd_driver __pci_driver = {
.ops = &sd_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_YANGTZE_SD,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_YANGTZE_SD,
};

4
src/southbridge/amd/agesa/hudson/sm.c
View File

@@ -105,6 +105,6 @@ static struct device_operations smbus_ops = {
};
static const struct pci_driver smbus_driver __pci_driver = {
.ops = &smbus_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_SM,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_SM,
};

12
src/southbridge/amd/agesa/hudson/usb.c
View File

@@ -20,18 +20,18 @@ static struct device_operations usb_ops = {
static const struct pci_driver usb_0_driver __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_USB_18_0,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_USB_18_0,
};
static const struct pci_driver usb_1_driver __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_USB_18_2,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_USB_18_2,
};
static const struct pci_driver usb_4_driver __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_USB_20_5,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_USB_20_5,
};

36
src/southbridge/amd/cimx/sb800/late.c
View File

@@ -150,8 +150,8 @@ static struct device_operations lpc_ops = {
static const struct pci_driver lpc_driver __pci_driver = {
.ops = &lpc_ops,
.vendor = PCI_VENDOR_ID_ATI,
.device = PCI_DEVICE_ID_ATI_SB800_LPC,
.vendor = PCI_VID_ATI,
.device = PCI_DID_ATI_SB800_LPC,
};
static struct device_operations sata_ops = {
@@ -164,19 +164,19 @@ static struct device_operations sata_ops = {
static const struct pci_driver ahci_driver __pci_driver = {
.ops = &sata_ops,
.vendor = PCI_VENDOR_ID_ATI,
.device = PCI_DEVICE_ID_ATI_SB800_SATA_AHCI,
.vendor = PCI_VID_ATI,
.device = PCI_DID_ATI_SB800_SATA_AHCI,
};
static const struct pci_driver raid_driver __pci_driver = {
.ops = &sata_ops,
.vendor = PCI_VENDOR_ID_ATI,
.device = PCI_DEVICE_ID_ATI_SB800_SATA_RAID,
.vendor = PCI_VID_ATI,
.device = PCI_DID_ATI_SB800_SATA_RAID,
};
static const struct pci_driver raid5_driver __pci_driver = {
.ops = &sata_ops,
.vendor = PCI_VENDOR_ID_ATI,
.device = PCI_DEVICE_ID_ATI_SB800_SATA_RAID5,
.vendor = PCI_VID_ATI,
.device = PCI_DID_ATI_SB800_SATA_RAID5,
};
static struct device_operations usb_ops = {
@@ -191,20 +191,20 @@ static struct device_operations usb_ops = {
*/
static const struct pci_driver usb_ohci123_driver __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_ATI,
.device = PCI_DEVICE_ID_ATI_SB800_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */
.vendor = PCI_VID_ATI,
.device = PCI_DID_ATI_SB800_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */
};
static const struct pci_driver usb_ehci123_driver __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_ATI,
.device = PCI_DEVICE_ID_ATI_SB800_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */
.vendor = PCI_VID_ATI,
.device = PCI_DID_ATI_SB800_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */
};
static const struct pci_driver usb_ohci4_driver __pci_driver = {
.ops = &usb_ops,
.vendor = PCI_VENDOR_ID_ATI,
.device = PCI_DEVICE_ID_ATI_SB800_USB_20_5, /* OHCI-USB4 */
.vendor = PCI_VID_ATI,
.device = PCI_DID_ATI_SB800_USB_20_5, /* OHCI-USB4 */
};
static struct device_operations azalia_ops = {
@@ -216,8 +216,8 @@ static struct device_operations azalia_ops = {
static const struct pci_driver azalia_driver __pci_driver = {
.ops = &azalia_ops,
.vendor = PCI_VENDOR_ID_ATI,
.device = PCI_DEVICE_ID_ATI_SB800_HDA,
.vendor = PCI_VID_ATI,
.device = PCI_DID_ATI_SB800_HDA,
};
static struct device_operations gec_ops = {
@@ -229,8 +229,8 @@ static struct device_operations gec_ops = {
static const struct pci_driver gec_driver __pci_driver = {
.ops = &gec_ops,
.vendor = PCI_VENDOR_ID_ATI,
.device = PCI_DEVICE_ID_ATI_SB800_GEC,
.vendor = PCI_VID_ATI,
.device = PCI_DID_ATI_SB800_GEC,
};
/**

6
src/southbridge/amd/pi/hudson/hda.c
View File

@@ -7,8 +7,8 @@
#include "hudson.h"
static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_AMD_SB900_HDA,
PCI_DEVICE_ID_AMD_CZ_HDA,
PCI_DID_AMD_SB900_HDA,
PCI_DID_AMD_CZ_HDA,
0
};
@@ -26,6 +26,6 @@ static struct device_operations hda_audio_ops = {
static const struct pci_driver hdaaudio_driver __pci_driver = {
.ops = &hda_audio_ops,
.vendor = PCI_VENDOR_ID_AMD,
.vendor = PCI_VID_AMD,
.devices = pci_device_ids,
};

5
src/southbridge/amd/pi/hudson/hudson.c
View File

@@ -33,12 +33,11 @@ void hudson_enable(struct device *dev)
u32 sd_device_id = pci_read_config16(dev, PCI_DEVICE_ID);
/* turn off the SDHC controller in the PM reg */
u8 reg8;
if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) {
if (sd_device_id == PCI_DID_AMD_HUDSON_SD) {
reg8 = pm_read8(PM_HUD_SD_FLASH_CTRL);
reg8 &= ~BIT(0);
pm_write8(PM_HUD_SD_FLASH_CTRL, reg8);
}
else if (sd_device_id == PCI_DEVICE_ID_AMD_YANGTZE_SD) {
} else if (sd_device_id == PCI_DID_AMD_YANGTZE_SD) {
reg8 = pm_read8(PM_YANG_SD_FLASH_CTRL);
reg8 &= ~BIT(0);
pm_write8(PM_YANG_SD_FLASH_CTRL, reg8);

4
src/southbridge/amd/pi/hudson/ide.c
View File

@@ -19,6 +19,6 @@ static struct device_operations ide_ops = {
static const struct pci_driver ide_driver __pci_driver = {
.ops = &ide_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_IDE,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_IDE,
};

6
src/southbridge/amd/pi/hudson/lpc.c
View File

@@ -355,13 +355,13 @@ static struct device_operations lpc_ops = {
static const unsigned short pci_device_ids[] = {
/* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */
PCI_DEVICE_ID_AMD_SB900_LPC,
PCI_DID_AMD_SB900_LPC,
/* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */
PCI_DEVICE_ID_AMD_CZ_LPC,
PCI_DID_AMD_CZ_LPC,
0
};
static const struct pci_driver lpc_driver __pci_driver = {
.ops = &lpc_ops,
.vendor = PCI_VENDOR_ID_AMD,
.vendor = PCI_VID_AMD,
.devices = pci_device_ids,
};

4
src/southbridge/amd/pi/hudson/pci.c
View File

@@ -41,6 +41,6 @@ static struct device_operations pci_ops = {
static const struct pci_driver pci_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_PCI,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_PCI,
};

16
src/southbridge/amd/pi/hudson/pcie.c
View File

@@ -25,22 +25,22 @@ static struct device_operations pci_ops = {
static const struct pci_driver pciea_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEA,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_PCIEA,
};
static const struct pci_driver pcieb_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEB,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_PCIEB,
};
static const struct pci_driver pciec_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_PCIEC,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_PCIEC,
};
static const struct pci_driver pcied_driver __pci_driver = {
.ops = &pci_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_SB900_PCIED,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_SB900_PCIED,
};

10
src/southbridge/amd/pi/hudson/sata.c
View File

@@ -52,15 +52,15 @@ static struct device_operations sata_ops = {
};
static const unsigned short pci_device_ids[] = {
PCI_DEVICE_ID_AMD_SB900_SATA,
PCI_DEVICE_ID_AMD_SB900_SATA_AHCI,
PCI_DEVICE_ID_AMD_CZ_SATA,
PCI_DEVICE_ID_AMD_CZ_SATA_AHCI,
PCI_DID_AMD_SB900_SATA,
PCI_DID_AMD_SB900_SATA_AHCI,
PCI_DID_AMD_CZ_SATA,
PCI_DID_AMD_CZ_SATA_AHCI,
0
};
static const struct pci_driver sata0_driver __pci_driver = {
.ops = &sata_ops,
.vendor = PCI_VENDOR_ID_AMD,
.vendor = PCI_VID_AMD,
.devices = pci_device_ids,
};

4
src/southbridge/amd/pi/hudson/sd.c
View File

@@ -47,6 +47,6 @@ static struct device_operations sd_ops = {
static const struct pci_driver sd_driver __pci_driver = {
.ops = &sd_ops,
.vendor = PCI_VENDOR_ID_AMD,
.device = PCI_DEVICE_ID_AMD_YANGTZE_SD,
.vendor = PCI_VID_AMD,
.device = PCI_DID_AMD_YANGTZE_SD,
};

4
src/southbridge/amd/pi/hudson/sm.c
View File

@@ -105,7 +105,7 @@ static struct device_operations smbus_ops = {
};
static const struct pci_driver smbus_driver __pci_driver = {
.ops = &smbus_ops,
.vendor = PCI_VENDOR_ID_AMD,
.vendor = PCI_VID_AMD,
/* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */
.device = PCI_DEVICE_ID_AMD_SB900_SM,
.device = PCI_DID_AMD_SB900_SM,
};

14
src/southbridge/amd/pi/hudson/usb.c
View File

@@ -19,17 +19,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,
};