[PATCH] mmc: renesas_sdhi: remove superfluous specific M3W entry

[PATCH] mmc: renesas_sdhi: remove superfluous specific M3W entry

[Wolfram Sang]

We don't need to specify the Gen3 compatible entry for M3W because it
will be provided by the generic Gen3 fallback.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

This should be the final of_device_id fix. Builds fine. But I can't test
because my HW is currently at a different location. Reviews from Geert
and/or Shimoda-san would be much appreciated.

 drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
index c9585c4fd812..3084b15ae2cb 100644
--- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
+++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
@@ -262,7 +262,6 @@ static const struct of_device_id renesas_sdhi_internal_dmac_of_match[] = {
 	{ .compatible = "renesas,sdhi-r7s9210", .data = &of_rza2_compatible, },
 	{ .compatible = "renesas,sdhi-mmc-r8a77470", .data = &of_rcar_gen3_compatible, },
 	{ .compatible = "renesas,sdhi-r8a7795", .data = &of_r8a7795_compatible, },
-	{ .compatible = "renesas,sdhi-r8a7796", .data = &of_rcar_gen3_compatible, },
 	{ .compatible = "renesas,sdhi-r8a77961", .data = &of_r8a77961_compatible, },
 	{ .compatible = "renesas,sdhi-r8a77965", .data = &of_r8a77965_compatible, },
 	{ .compatible = "renesas,sdhi-r8a77970", .data = &of_r8a77970_compatible, },
-- 
2.30.2

Re: [PATCH] mmc: renesas_sdhi: remove superfluous specific M3W entry

[Geert Uytterhoeven]

Hi Wolfram,

On Mon, Apr 4, 2022 at 3:05 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> We don't need to specify the Gen3 compatible entry for M3W because it
> will be provided by the generic Gen3 fallback.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Initially, arch/arm64/boot/dts/renesas/r8a7796.dtsi did not have
the family-specific compatible value.  As commit e871efc9a4f48c9b
("arm64: dts: renesas: r8a7796: Use R-Car SDHI Gen3 fallback compat
string") is included in v4.16 and later, this change should be fine.

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

Re: [PATCH] mmc: renesas_sdhi: remove superfluous specific M3W entry

[Ulf Hansson]

On Mon, 4 Apr 2022 at 15:06, Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
>
> We don't need to specify the Gen3 compatible entry for M3W because it
> will be provided by the generic Gen3 fallback.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Applied for next, thanks!

Kind regards
Uffe


> ---
>
> This should be the final of_device_id fix. Builds fine. But I can't test
> because my HW is currently at a different location. Reviews from Geert
> and/or Shimoda-san would be much appreciated.
>
>  drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> index c9585c4fd812..3084b15ae2cb 100644
> --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
> @@ -262,7 +262,6 @@ static const struct of_device_id renesas_sdhi_internal_dmac_of_match[] = {
>         { .compatible = "renesas,sdhi-r7s9210", .data = &of_rza2_compatible, },
>         { .compatible = "renesas,sdhi-mmc-r8a77470", .data = &of_rcar_gen3_compatible, },
>         { .compatible = "renesas,sdhi-r8a7795", .data = &of_r8a7795_compatible, },
> -       { .compatible = "renesas,sdhi-r8a7796", .data = &of_rcar_gen3_compatible, },
>         { .compatible = "renesas,sdhi-r8a77961", .data = &of_r8a77961_compatible, },
>         { .compatible = "renesas,sdhi-r8a77965", .data = &of_r8a77965_compatible, },
>         { .compatible = "renesas,sdhi-r8a77970", .data = &of_r8a77970_compatible, },
> --
> 2.30.2
>