1 files changed, 14 insertions, 14 deletions

diff --git a/drivers/pci/host/pcie-iproc-platform.c b/drivers/pci/host/pcie-iproc-platform.c
index a3de087976b3..22d814a78a78 100644
--- a/drivers/pci/host/pcie-iproc-platform.c
+++ b/drivers/pci/host/pcie-iproc-platform.c
@@ -31,8 +31,14 @@ static const struct of_device_id iproc_pcie_of_match_table[] = {
                 .compatible = "brcm,iproc-pcie",
                 .data = (int *)IPROC_PCIE_PAXB,
         }, {
+                .compatible = "brcm,iproc-pcie-paxb-v2",
+                .data = (int *)IPROC_PCIE_PAXB_V2,
+        }, {
                 .compatible = "brcm,iproc-pcie-paxc",
                 .data = (int *)IPROC_PCIE_PAXC,
+        }, {
+                .compatible = "brcm,iproc-pcie-paxc-v2",
+                .data = (int *)IPROC_PCIE_PAXC_V2,
         },
         { /* sentinel */ }
 };
@@ -84,19 +90,6 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
                         return ret;
                 }
                 pcie->ob.axi_offset = val;
-
-                ret = of_property_read_u32(np, "brcm,pcie-ob-window-size",
-                                           &val);
-                if (ret) {
-                        dev_err(dev,
-                                "missing brcm,pcie-ob-window-size property\n");
-                        return ret;
-                }
-                pcie->ob.window_size = (resource_size_t)val * SZ_1M;
-
-                if (of_property_read_bool(np, "brcm,pcie-ob-oarr-size"))
-                        pcie->ob.set_oarr_size = true;
-
                 pcie->need_ob_cfg = true;
         }
 
@@ -115,7 +108,14 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
                 return ret;
         }
 
-        pcie->map_irq = of_irq_parse_and_map_pci;
+        /* PAXC doesn't support legacy IRQs, skip mapping */
+        switch (pcie->type) {
+        case IPROC_PCIE_PAXC:
+        case IPROC_PCIE_PAXC_V2:
+                break;
+        default:
+                pcie->map_irq = of_irq_parse_and_map_pci;
+        }
 
         ret = iproc_pcie_setup(pcie, &res);
         if (ret)