On Fri, Dec 02, 2016 at 10:19:21AM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
>
> On Thu, Dec 1, 2016 at 5:28 PM, Simon Horman <horms+renesas@xxxxxxxxxxxx> wrote:
> > Add fallback compatibility string for the R-Car Gen 3 family. This is in
> > keeping with the both the existing fallback compatibility string for the
> > R-Car Gen 2 family and the fallback scheme being adopted wherever
> > appropriate for drivers for Renesas SoCs.
> >
> > Signed-off-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
> > ---
> > Documentation/devicetree/bindings/pci/rcar-pci.txt | 1 +
> > drivers/pci/host/pcie-rcar.c | 2 ++
> > 2 files changed, 3 insertions(+)
> >
> > 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/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
> > index 62700d1896f4..962aa3942107 100644
> > --- a/drivers/pci/host/pcie-rcar.c
> > +++ b/drivers/pci/host/pcie-rcar.c
> > @@ -1077,6 +1077,8 @@ static const struct of_device_id rcar_pcie_of_match[] = {
> > .data = rcar_pcie_hw_init_gen2 },
> > { .compatible = "renesas,pcie-r8a7791",
> > .data = rcar_pcie_hw_init_gen2 },
> > + { .compatible = "renesas,pcie-rcar-gen3",
> > + .data = rcar_pcie_hw_init_hw_init },
>
> The family-specific handling should be inserted after the SoC-specific
> handling.
> Currently it doesn't matter, as both are handled exactly the same, but
> it may avoid future mistakes.
>
> BTW, can you please fix that for the existing entry for Gen2, too?
Sure, will do.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
