Commit dda4b381 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 7b4bc101 894682f0

drivers/pci/controller/pci-xgene.c

+1 −2
Original line number Diff line number Diff line
@@ -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);