From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-pci-owner@vger.kernel.org>
Received: from kirsty.vergenet.net ([202.4.237.240]:35661 "EHLO
        kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751201AbcLBJd0 (ORCPT
        <rfc822;linux-pci@vger.kernel.org>); Fri, 2 Dec 2016 04:33:26 -0500
Date: Fri, 2 Dec 2016 10:33:19 +0100
From: Simon Horman <horms@verge.net.au>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
        Phil Edworthy <phil.edworthy@renesas.com>,
        Magnus Damm <magnus.damm@gmail.com>,
        linux-pci <linux-pci@vger.kernel.org>,
        Linux-Renesas <linux-renesas-soc@vger.kernel.org>,
        Rob Herring <robh+dt@kernel.org>,
        "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>
Subject: Re: [PATCH pci/next] PCI: rcar: Add gen3 fallback compatibility
 string for pcie-rcar
Message-ID: <20161202093316.GA7341@verge.net.au>
References: <1480609693-25746-1-git-send-email-horms+renesas@verge.net.au>
 <CAMuHMdWwuQZq7FzDUtCj5gsdQra5PrSyoUk7-ycBN9pN-RYcrA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
In-Reply-To: <CAMuHMdWwuQZq7FzDUtCj5gsdQra5PrSyoUk7-ycBN9pN-RYcrA@mail.gmail.com>
Sender: linux-pci-owner@vger.kernel.org
List-ID: <linux-pci.vger.kernel.org>

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@verge.net.au> 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@verge.net.au>
> > ---
> >  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.