PCI: rcar: Add gen2 fallback compatibility string for pci-rcar-gen2

Add fallback compatibility string for R-Car Gen 2 family.  This is in
keeping with the fallback scheme being adopted wherever appropriate for
drivers for Renesas SoCs.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rob Herring <robh@kernel.org>

diff --git a/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt b/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt
index 891463cb09c237dbb049f49290c834cd7902343c..4e8b90e43dd83c72d81df6d644317ba60b489559 100644 (file)
--- a/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt
+++ b/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt
@@ -8,7 +8,14 @@ OHCI and EHCI controllers.
 Required properties:
 - compatible: "renesas,pci-r8a7790" for the R8A7790 SoC;
              "renesas,pci-r8a7791" for the R8A7791 SoC;
-             "renesas,pci-r8a7794" for the R8A7794 SoC.
+             "renesas,pci-r8a7794" for the R8A7794 SoC;
+             "renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device
+
+
+             When compatible with the generic version, nodes must list the
+             SoC-specific version corresponding to the platform first
+             followed by the generic version.
+
 - reg: A list of physical regions to access the device: the first is
        the operational registers for the OHCI/EHCI controllers and the
        second is for the bridge configuration and control registers.
@@ -32,7 +39,7 @@ Optional properties:
 Example SoC configuration:
 
        pci0: pci@ee090000  {
-               compatible = "renesas,pci-r8a7790";
+               compatible = "renesas,pci-r8a7790", "renesas,pci-rcar-gen2";
                clocks = <&mstp7_clks R8A7790_CLK_EHCI>;
                reg = <0x0 0xee090000 0x0 0xc00>,
                      <0x0 0xee080000 0x0 0x1100>;

diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c
index 62951165dcbb84065f81d9f186274d1bf3fd9aa1..9980a4bdae7ee1c68c1f3c9bab2bdfee0a6b9ab2 100644 (file)
--- a/drivers/pci/host/pci-rcar-gen2.c
+++ b/drivers/pci/host/pci-rcar-gen2.c
@@ -430,6 +430,7 @@ 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", },