mmc: sdhci-uhs2: add pre-detect_init hook

This "pre" hook for detect_init(), uhs2_pre_detect_init, will be required
to enable UHS-II support, at least, on GL9755.

Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw>
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Message-ID: <20241018105333.4569-14-victorshihgli@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
index d99ea05098cb4c71b7329a6032e7d9c9a550ff06..c488c6d56015f7e0ba34f315bd35ff62a84e0b47 100644 (file)
--- a/drivers/mmc/host/sdhci-uhs2.c
+++ b/drivers/mmc/host/sdhci-uhs2.c
@@ -413,6 +413,9 @@ static int sdhci_uhs2_do_detect_init(struct mmc_host *mmc)
 
        DBG("Begin do uhs2 detect init.\n");
 
+       if (host->ops && host->ops->uhs2_pre_detect_init)
+               host->ops->uhs2_pre_detect_init(host);
+
        if (sdhci_uhs2_interface_detect(host)) {
                pr_warn("%s: cannot detect UHS2 interface.\n", mmc_hostname(host->mmc));
                return -EIO;

diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index c636808139d50dd1ff56d37fc329790187b7f0ab..cd0e35a805427c5e7899c45423a7493cb6cb65e0 100644 (file)
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -723,6 +723,7 @@ struct sdhci_ops {
                                struct mmc_request *mrq);
        void    (*dump_vendor_regs)(struct sdhci_host *host);
        void    (*dump_uhs2_regs)(struct sdhci_host *host);
+       void    (*uhs2_pre_detect_init)(struct sdhci_host *host);
 };
 
 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS