| Message ID | 20171108091521.8423-1-marek.vasut+renesas@gmail.com (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Simon Horman |
| Headers | show |
Hello! On 11/8/2017 12:15 PM, Marek Vasut wrote: > From: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> > > Add compatible string for the RCar M3 R8A7796 SoC. It's M3-W. > Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Simon Horman <horms+renesas@verge.net.au> > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: linux-renesas-soc@vger.kernel.org > --- > drivers/pci/host/pcie-rcar.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index 12796eccb2be..8b51208875fc 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -1062,6 +1062,7 @@ static const struct of_device_id rcar_pcie_of_match[] = { > { .compatible = "renesas,pcie-rcar-gen2", > .data = rcar_pcie_hw_init_gen2 }, > { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init }, > + { .compatible = "renesas,pcie-r8a7796", .data = rcar_pcie_hw_init }, Why, if we already have the line below? And don't you need to update the bindings? > { .compatible = "renesas,pcie-rcar-gen3", .data = rcar_pcie_hw_init }, > {}, > }; MBR, Sergei
Hi Marek, On Wed, Nov 8, 2017 at 10:15 AM, Marek Vasut <marek.vasut@gmail.com> wrote: > From: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> > > Add compatible string for the RCar M3 R8A7796 SoC. > > Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> This patch is not needed, as the DT bindings specify that the DTS should use both "renesas,pcie-r8a7796" and "renesas,pcie-rcar-gen3", and the driver already matches against the latter. > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -1062,6 +1062,7 @@ static const struct of_device_id rcar_pcie_of_match[] = { > { .compatible = "renesas,pcie-rcar-gen2", > .data = rcar_pcie_hw_init_gen2 }, > { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init }, > + { .compatible = "renesas,pcie-r8a7796", .data = rcar_pcie_hw_init }, > { .compatible = "renesas,pcie-rcar-gen3", .data = rcar_pcie_hw_init }, Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On 11/08/2017 10:28 AM, Sergei Shtylyov wrote: > Hello! Hi > On 11/8/2017 12:15 PM, Marek Vasut wrote: > >> From: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> >> >> Add compatible string for the RCar M3 R8A7796 SoC. > > It's M3-W. > >> Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> >> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> >> Cc: Geert Uytterhoeven <geert+renesas@glider.be> >> Cc: Simon Horman <horms+renesas@verge.net.au> >> Cc: Wolfram Sang <wsa@the-dreams.de> >> Cc: linux-renesas-soc@vger.kernel.org >> --- >> drivers/pci/host/pcie-rcar.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c >> index 12796eccb2be..8b51208875fc 100644 >> --- a/drivers/pci/host/pcie-rcar.c >> +++ b/drivers/pci/host/pcie-rcar.c >> @@ -1062,6 +1062,7 @@ static const struct of_device_id >> rcar_pcie_of_match[] = { >> { .compatible = "renesas,pcie-rcar-gen2", >> .data = rcar_pcie_hw_init_gen2 }, >> { .compatible = "renesas,pcie-r8a7795", .data = >> rcar_pcie_hw_init }, >> + { .compatible = "renesas,pcie-r8a7796", .data = rcar_pcie_hw_init }, > > Why, if we already have the line below? For the sake of completeness, but I'll reply to Geerts email about this. > And don't you need to update the bindings? Nope, the bindings already have this entry. >> { .compatible = "renesas,pcie-rcar-gen3", .data = >> rcar_pcie_hw_init }, >> {}, >> }; > > MBR, Sergei
On 11/08/2017 10:29 AM, Geert Uytterhoeven wrote: > Hi Marek, Hi, > On Wed, Nov 8, 2017 at 10:15 AM, Marek Vasut <marek.vasut@gmail.com> wrote: >> From: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> >> >> Add compatible string for the RCar M3 R8A7796 SoC. >> >> Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com> >> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > > This patch is not needed, as the DT bindings specify that the DTS should use > both "renesas,pcie-r8a7796" and "renesas,pcie-rcar-gen3", and the driver > already matches against the latter. OK, then please just drop this one. I'll keep this in mind next time I add redundant bindings, thanks :) >> --- a/drivers/pci/host/pcie-rcar.c >> +++ b/drivers/pci/host/pcie-rcar.c >> @@ -1062,6 +1062,7 @@ static const struct of_device_id rcar_pcie_of_match[] = { >> { .compatible = "renesas,pcie-rcar-gen2", >> .data = rcar_pcie_hw_init_gen2 }, >> { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init }, >> + { .compatible = "renesas,pcie-r8a7796", .data = rcar_pcie_hw_init }, >> { .compatible = "renesas,pcie-rcar-gen3", .data = rcar_pcie_hw_init }, > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds >
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 12796eccb2be..8b51208875fc 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -1062,6 +1062,7 @@ static const struct of_device_id rcar_pcie_of_match[] = { { .compatible = "renesas,pcie-rcar-gen2", .data = rcar_pcie_hw_init_gen2 }, { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init }, + { .compatible = "renesas,pcie-r8a7796", .data = rcar_pcie_hw_init }, { .compatible = "renesas,pcie-rcar-gen3", .data = rcar_pcie_hw_init }, {}, };