Merge branch 'remotes/lorenzo/pci/iproc'

  - Remove iproc PAXC slot check to allow VF support (Jitendra Bhivare)

* remotes/lorenzo/pci/iproc:
  PCI: iproc: Remove PAXC slot check to allow VF support

diff --git a/drivers/pci/controller/pcie-iproc.c b/drivers/pci/controller/pcie-iproc.c
index 3160e9342a2fb424ded9edea1c43bee4782eb54f..c20fd6bd68fd80e19fcfe51e7c7268ff8847662e 100644 (file)
--- a/drivers/pci/controller/pcie-iproc.c
+++ b/drivers/pci/controller/pcie-iproc.c
@@ -630,14 +630,6 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct iproc_pcie *pcie,
                        return (pcie->base + offset);
        }
 
-       /*
-        * PAXC is connected to an internally emulated EP within the SoC.  It
-        * allows only one device.
-        */
-       if (pcie->ep_is_internal)
-               if (slot > 0)
-                       return NULL;
-
        return iproc_pcie_map_ep_cfg_reg(pcie, busno, slot, fn, where);
 }