Merge branch 'pci/host-rcar' into next

* pci/host-rcar:
  PCI: rcar: Add gen3 fallback compatibility string for pcie-rcar
  PCI: rcar: Use gen2 fallback compatibility last
  PCI: rcar-gen2: Use gen2 fallback compatibility last

3 files changed, 5 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/pci/rcar-pci.txt b/Documentation/devicetree/bindings/pci/rcar-pci.txt
index 6cf99690eef9..eee518db90b9 100644
--- a/Documentation/devicetree/bindings/pci/rcar-pci.txt
+++ b/Documentation/devicetree/bindings/pci/rcar-pci.txt
@@ -7,6 +7,7 @@ compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;
             "renesas,pcie-r8a7793" for the R8A7793 SoC;
             "renesas,pcie-r8a7795" for the R8A7795 SoC;
             "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device.
+            "renesas,pcie-rcar-gen3" for a generic R-Car Gen3 compatible device.
 
             When compatible with the generic version, nodes must list the
             SoC-specific version corresponding to the platform first
diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c
index 1eeefa4df64c..85348590848b 100644
--- a/drivers/pci/host/pci-rcar-gen2.c
+++ b/drivers/pci/host/pci-rcar-gen2.c
@@ -430,10 +430,10 @@ static int rcar_pci_probe(struct platform_device *pdev)
 }
 
 static struct of_device_id rcar_pci_of_match[] = {
-        { .compatible = "renesas,pci-rcar-gen2", },
         { .compatible = "renesas,pci-r8a7790", },
         { .compatible = "renesas,pci-r8a7791", },
         { .compatible = "renesas,pci-r8a7794", },
+        { .compatible = "renesas,pci-rcar-gen2", },
         { },
 };
 
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 62700d1896f4..aca85be101f8 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -1071,13 +1071,14 @@ static int rcar_pcie_parse_map_dma_ranges(struct rcar_pcie *pcie,
 
 static const struct of_device_id rcar_pcie_of_match[] = {
         { .compatible = "renesas,pcie-r8a7779", .data = rcar_pcie_hw_init_h1 },
-        { .compatible = "renesas,pcie-rcar-gen2",
-          .data = rcar_pcie_hw_init_gen2 },
         { .compatible = "renesas,pcie-r8a7790",
           .data = rcar_pcie_hw_init_gen2 },
         { .compatible = "renesas,pcie-r8a7791",
           .data = rcar_pcie_hw_init_gen2 },
+        { .compatible = "renesas,pcie-rcar-gen2",
+          .data = rcar_pcie_hw_init_gen2 },
         { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init },
+        { .compatible = "renesas,pcie-rcar-gen3", .data = rcar_pcie_hw_init },
         {},
 };