From 632a7b118623e9ba3228053ac676c3c668a2fb33 Mon Sep 17 00:00:00 2001
From: Hai Pham <hai.pham.ud@renesas.com>
Date: Tue, 28 Feb 2023 22:24:06 +0100
Subject: [PATCH] mmc: renesas-sdhi: Add R-Car Gen4 support

Support R-Car Gen4 family. The default quirk is similar to previous
generation.

Reviewed-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Signed-off-by: Hai Pham <hai.pham.ud@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> # Use RCAR_64 Kconfig
---
 drivers/mmc/renesas-sdhi.c | 1 +
 drivers/mmc/tmio-common.c  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 34119f949a..280d96dbc2 100644
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -843,6 +843,7 @@ static const struct udevice_id renesas_sdhi_match[] = {
 	{ .compatible = "renesas,sdhi-r8a77970", .data = RENESAS_GEN3_QUIRKS },
 	{ .compatible = "renesas,sdhi-r8a77990", .data = RENESAS_GEN3_QUIRKS },
 	{ .compatible = "renesas,sdhi-r8a77995", .data = RENESAS_GEN3_QUIRKS },
+	{ .compatible = "renesas,rcar-gen4-sdhi", .data = RENESAS_GEN3_QUIRKS },
 	{ /* sentinel */ }
 };
 
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c
index d8b6a4a882..8d7ee481d6 100644
--- a/drivers/mmc/tmio-common.c
+++ b/drivers/mmc/tmio-common.c
@@ -369,7 +369,7 @@ static bool tmio_sd_addr_is_dmaable(struct mmc_data *data)
 	if (!IS_ALIGNED(addr, TMIO_SD_DMA_MINALIGN))
 		return false;
 
-	if (IS_ENABLED(CONFIG_RCAR_GEN3)) {
+	if (IS_ENABLED(CONFIG_RCAR_64)) {
 		if (!(data->flags & MMC_DATA_READ) && !IS_ALIGNED(addr, 128))
 			return false;
 		/* Gen3 DMA has 32bit limit */
-- 
2.39.5