Hello Geert,
Thank you for the feedback and welcome back!
> Subject: Re: [PATCH 1/2] iommu/ipmmu-vmsa: Hook up R8A774A1 DT maching code
>
> Hi Fabrizio,
>
> On Fri, Aug 17, 2018 at 4:31 PM Fabrizio Castro
> <fabrizio.castro@xxxxxxxxxxxxxx> wrote:
> > Add support for RZ/G2M (R8A774A1) SoC IPMMUs.
> >
> > Signed-off-by: Fabrizio Castro <fabrizio.castro@xxxxxxxxxxxxxx>
> > Reviewed-by: Biju Das <biju.das@xxxxxxxxxxxxxx>
> > ---
> > This patch applies on top of renesas-drivers-2018-07-31-v4.18-rc7
> >
> > drivers/iommu/ipmmu-vmsa.c | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
> > index 51af2c5..cf5cfcf 100644
> > --- a/drivers/iommu/ipmmu-vmsa.c
> > +++ b/drivers/iommu/ipmmu-vmsa.c
> > @@ -761,6 +761,7 @@ static bool ipmmu_slave_whitelist(struct device *dev)
> > }
> >
> > static const struct soc_device_attribute soc_rcar_gen3[] = {
> > + { .soc_id = "r8a774a1", },
> > { .soc_id = "r8a7795", },
> > { .soc_id = "r8a7796", },
> > { .soc_id = "r8a77965", },
> > @@ -942,6 +943,9 @@ static const struct of_device_id ipmmu_of_ids[] = {
> > .compatible = "renesas,ipmmu-vmsa",
> > .data = &ipmmu_features_default,
> > }, {
> > + .compatible = "renesas,ipmmu-r8a774a1",
> > + .data = &ipmmu_features_rcar_gen3,
> > + }, {
> > .compatible = "renesas,ipmmu-r8a7795",
> > .data = &ipmmu_features_rcar_gen3,
> > }, {
> > @@ -1143,6 +1147,7 @@ subsys_initcall(ipmmu_init);
> > module_exit(ipmmu_exit);
> >
> > IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa");
> > +IOMMU_OF_DECLARE(ipmmu_r8a774a1_iommu_of, "renesas,ipmmu-r8a774a1");
> > IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795");
> > IOMMU_OF_DECLARE(ipmmu_r8a7796_iommu_of, "renesas,ipmmu-r8a7796");
> > IOMMU_OF_DECLARE(ipmmu_r8a77965_iommu_of, "renesas,ipmmu-r8a77965");
>
> The IOMMU_OF_DECLARE() lines will be gone v4.18-rc1.
I can see the conflict now, therefore I am going to send a v2. I'll be basing the patch
on top of renesas-drivers-2018-07-31-v4.18-rc7 again, but this time I'll drop the
IOMMU_OF_DECLARE line, hopefully this will help.
Thanks,
Fab
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
>
> 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
Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.
