mmc: f-sdh30: Add support for non-removable media

To use F_SDH30 for non-removable meda like eMMC,
need to enable FORCE_CARD_INSERT bit to skip the delay for detection.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Acked-by: Jassi Brar <jaswinder.singh@linaro.org>
Link: https://lore.kernel.org/r/20221111081033.3813-6-hayashi.kunihiko@socionext.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c
index 556f4601643d97330ca9c2fb3c7f30835e8795f6..afbe17312cb6556680d253402c4bdbe07d4c79d4 100644 (file)
--- a/drivers/mmc/host/sdhci_f_sdh30.c
+++ b/drivers/mmc/host/sdhci_f_sdh30.c
@@ -77,6 +77,13 @@ static void sdhci_f_sdh30_reset(struct sdhci_host *host, u8 mask)
                ctl |= F_SDH30_CMD_DAT_DELAY;
                sdhci_writel(host, ctl, F_SDH30_ESD_CONTROL);
        }
+
+       if ((host->mmc->caps & MMC_CAP_NONREMOVABLE) &&
+           !(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)) {
+               ctl = sdhci_readl(host, F_SDH30_TEST);
+               ctl |= F_SDH30_FORCE_CARD_INSERT;
+               sdhci_writel(host, ctl, F_SDH30_TEST);
+       }
 }
 
 static const struct sdhci_ops sdhci_f_sdh30_ops = {

diff --git a/drivers/mmc/host/sdhci_f_sdh30.h b/drivers/mmc/host/sdhci_f_sdh30.h
index fc1ad28f7ca9edfcfa4a2f619f62cf945668dbcc..7c3c66291d42d57c68014ac13616d9436185a052 100644 (file)
--- a/drivers/mmc/host/sdhci_f_sdh30.h
+++ b/drivers/mmc/host/sdhci_f_sdh30.h
@@ -29,4 +29,7 @@
 #define  F_SDH30_CMD_DAT_DELAY BIT(9)
 #define         F_SDH30_EMMC_HS200             BIT(24)
 
+#define F_SDH30_TEST           0x158
+#define F_SDH30_FORCE_CARD_INSERT      BIT(6)
+
 #define F_SDH30_MIN_CLOCK              400000