- 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
Unified · Split
| @@ -48,7 +48,6 @@ · 47 unmodified lines | |||
| 48 | #define EN_COHERENCY 0xF0000000 | 48 | #define EN_COHERENCY 0xF0000000 |
| 49 | #define EN_REG 0x00000001 | 49 | #define EN_REG 0x00000001 |
| 50 | #define OB_LO_IO 0x00000002 | 50 | #define OB_LO_IO 0x00000002 |
| 51 | #define XGENE_PCIE_VENDORID 0x10E8 | ||
| 52 | #define XGENE_PCIE_DEVICEID 0xE004 | 51 | #define XGENE_PCIE_DEVICEID 0xE004 |
| 53 | #define SZ_1T (SZ_1G*1024ULL) | 52 | #define SZ_1T (SZ_1G*1024ULL) |
| 54 | #define PIPE_PHY_RATE_RD(src) ((0xc000 & (u32)(src)) >> 0xe) | 53 | #define PIPE_PHY_RATE_RD(src) ((0xc000 & (u32)(src)) >> 0xe) |
| @@ -560,7 +559,7 @@ static int xgene_pcie_setup(struct xgene_pcie_port *port) · 505 unmodified lines | |||
| 560 | xgene_pcie_clear_config(port); | 559 | xgene_pcie_clear_config(port); |
| 561 | 560 | ||
| 562 | /* setup the vendor and device IDs correctly */ | 561 | /* setup the vendor and device IDs correctly */ |
| 563 | val = (XGENE_PCIE_DEVICEID << 16) | XGENE_PCIE_VENDORID; | 562 | val = (XGENE_PCIE_DEVICEID << 16) | PCI_VENDOR_ID_AMCC; |
| 564 | xgene_pcie_writel(port, BRIDGE_CFG_0, val); | 563 | xgene_pcie_writel(port, BRIDGE_CFG_0, val); |
| 565 | 564 | ||
| 566 | ret = xgene_pcie_map_ranges(port); | 565 | ret = xgene_pcie_map_ranges(port); |