History

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

Bjorn Helgaas committed 5 years ago

Commit dda4b382 parents 7b4bc10 894682f1 file · +1 −2Browse files

Unified · Split

drivers/pci/controller/pci-xgene.c+1−2
@@ -48,7 +48,6 @@ · 47 unmodified lines
4848 #define EN_COHERENCY 0xF0000000
4949 #define EN_REG 0x00000001
5050 #define OB_LO_IO 0x00000002
51−#define XGENE_PCIE_VENDORID 0x10E8
5251 #define XGENE_PCIE_DEVICEID 0xE004
5352 #define SZ_1T (SZ_1G*1024ULL)
5453 #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
560559 xgene_pcie_clear_config(port);
561560
562561 /* 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;
564563 xgene_pcie_writel(port, BRIDGE_CFG_0, val);
565564
566565 ret = xgene_pcie_map_ranges(port);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t