diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 11:28:53 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 11:28:53 -0500 |
| commit | dda4b381f05d447a0ae31e2e44aeb35d313a311f (patch) | |
| tree | 136b085dae638a128b3fd8987863b1873a7fa9ac | |
| parent | Merge branch 'remotes/lorenzo/pci/vmd' (diff) | |
| parent | PCI: xgene: Use PCI_VENDOR_ID_AMCC macro (diff) | |
| download | wireguard-linux-dda4b381f05d447a0ae31e2e44aeb35d313a311f.tar.xz wireguard-linux-dda4b381f05d447a0ae31e2e44aeb35d313a311f.zip | |
Merge branch 'remotes/lorenzo/pci/xgene'
- Use PCI_VENDOR_ID_AMCC macro instead of defining a custom macro in
pci-xgene.c (Pali Rohár)
* remotes/lorenzo/pci/xgene:
PCI: xgene: Use PCI_VENDOR_ID_AMCC macro
| -rw-r--r-- | drivers/pci/controller/pci-xgene.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c index e64536047b65..56d0d50338c8 100644 --- a/drivers/pci/controller/pci-xgene.c +++ b/drivers/pci/controller/pci-xgene.c @@ -48,7 +48,6 @@ #define EN_COHERENCY 0xF0000000 #define EN_REG 0x00000001 #define OB_LO_IO 0x00000002 -#define XGENE_PCIE_VENDORID 0x10E8 #define XGENE_PCIE_DEVICEID 0xE004 #define SZ_1T (SZ_1G*1024ULL) #define PIPE_PHY_RATE_RD(src) ((0xc000 & (u32)(src)) >> 0xe) @@ -560,7 +559,7 @@ static int xgene_pcie_setup(struct xgene_pcie_port *port) xgene_pcie_clear_config(port); /* setup the vendor and device IDs correctly */ - val = (XGENE_PCIE_DEVICEID << 16) | XGENE_PCIE_VENDORID; + val = (XGENE_PCIE_DEVICEID << 16) | PCI_VENDOR_ID_AMCC; xgene_pcie_writel(port, BRIDGE_CFG_0, val); ret = xgene_pcie_map_ranges(port); |