From: Mengqi Zhang <mengqi.zhang@mediatek.com>
Date: Mon, 25 Dec 2023 09:38:40 +0000 (+0800)
Subject: mmc: core: Add HS400 tuning in HS400es initialization
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=77e01b49e35f24ebd1659096d5fc5c3b75975545;p=linux.git

mmc: core: Add HS400 tuning in HS400es initialization

During the initialization to HS400es stage, add a HS400 tuning flow as an
optional process. For Mediatek IP, the HS400es mode requires a specific
tuning to ensure the correct HS400 timing setting.

Signed-off-by: Mengqi Zhang <mengqi.zhang@mediatek.com>
Link: https://lore.kernel.org/r/20231225093839.22931-2-mengqi.zhang@mediatek.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index adf7b70cf1b66..f410bee501328 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1831,8 +1831,13 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
 
 		if (err)
 			goto free_card;
-
-	} else if (!mmc_card_hs400es(card)) {
+	} else if (mmc_card_hs400es(card)) {
+		if (host->ops->execute_hs400_tuning) {
+			err = host->ops->execute_hs400_tuning(host, card);
+			if (err)
+				goto free_card;
+		}
+	} else {
 		/* Select the desired bus width optionally */
 		err = mmc_select_bus_width(card);
 		if (err > 0 && mmc_card_hs(card)) {