[V5,22/26] mmc: sdhci-uhs2: add pre-detect_init hook

Message ID	20221014114601.15594-23-victor.shih@genesyslogic.com.tw
State	Superseded
Headers	show Return-Path: <linux-mmc-owner@kernel.org> From: Victor Shih <victorshihgli@gmail.com> To: ulf.hansson@linaro.org, adrian.hunter@intel.com Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, benchuanggli@gmail.com, HL.Liu@genesyslogic.com.tw, Greg.tu@genesyslogic.com.tw, takahiro.akashi@linaro.org, dlunev@chromium.org, Victor Shih <victor.shih@genesyslogic.com.tw>, Ben Chuang <ben.chuang@genesyslogic.com.tw> Subject: [PATCH V5 22/26] mmc: sdhci-uhs2: add pre-detect_init hook Date: Fri, 14 Oct 2022 19:45:57 +0800 Message-Id: <20221014114601.15594-23-victor.shih@genesyslogic.com.tw> In-Reply-To: <20221014114601.15594-1-victor.shih@genesyslogic.com.tw> References: <20221014114601.15594-1-victor.shih@genesyslogic.com.tw> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Add support UHS-II for GL9755 \| expand [V5,00/26] Add support UHS-II for GL9755 [V5,01/26] mmc: core: Cleanup printing of speed mode at card insertion [V5,02/26] mmc: core: Prepare to support SD UHS-II cards [V5,03/26] mmc: core: Announce successful insertion of an SD UHS-II card [V5,04/26] mmc: core: Extend support for mmc regulators with a vqmmc2 [V5,05/26] mmc: core: Add definitions for SD UHS-II cards [V5,06/26] mmc: core: Support UHS-II card control and access [V5,07/26] mmc: sdhci: add a kernel configuration for enabling UHS-II support [V5,08/26] mmc: sdhci: add UHS-II related definitions in headers [V5,09/26] mmc: sdhci: add UHS-II module [V5,10/26] mmc: sdhci-uhs2: dump UHS-II registers [V5,11/26] mmc: sdhci-uhs2: add reset function and uhs2_mode function [V5,12/26] mmc: sdhci-uhs2: add set_power() to support vdd2 [V5,13/26] mmc: sdhci-uhs2: skip signal_voltage_switch() [V5,14/26] mmc: sdhci-uhs2: add set_timeout() [V5,15/26] mmc: sdhci-uhs2: add set_ios() [V5,16/26] mmc: sdhci-uhs2: add detect_init() to detect the interface [V5,17/26] mmc: sdhci-uhs2: add clock operations [V5,18/26] mmc: sdhci-uhs2: add uhs2_control() to initialise the interface [V5,19/26] mmc: sdhci-uhs2: add request() and others [V5,20/26] mmc: sdhci-uhs2: add irq() and others [V5,21/26] mmc: sdhci-uhs2: add add_host() and others to set up the driver [V5,22/26] mmc: sdhci-uhs2: add pre-detect_init hook [V5,23/26] mmc: core: add post-mmc_attach_sd hook [V5,24/26] mmc: sdhci-uhs2: add post-mmc_attach_sd hook [V5,25/26] mmc: sdhci-pci: add UHS-II support framework [V5,26/26] mmc: sdhci-pci-gli: enable UHS-II mode for GL9755

Message ID

20221014114601.15594-23-victor.shih@genesyslogic.com.tw

State

Superseded

Headers

From: Victor Shih <victorshihgli@gmail.com>
To: ulf.hansson@linaro.org, adrian.hunter@intel.com
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
        benchuanggli@gmail.com, HL.Liu@genesyslogic.com.tw,
        Greg.tu@genesyslogic.com.tw, takahiro.akashi@linaro.org,
        dlunev@chromium.org, Victor Shih <victor.shih@genesyslogic.com.tw>,
        Ben Chuang <ben.chuang@genesyslogic.com.tw>
Subject: [PATCH V5 22/26] mmc: sdhci-uhs2: add pre-detect_init hook
Date: Fri, 14 Oct 2022 19:45:57 +0800
Message-Id: <20221014114601.15594-23-victor.shih@genesyslogic.com.tw>
In-Reply-To: <20221014114601.15594-1-victor.shih@genesyslogic.com.tw>
References: <20221014114601.15594-1-victor.shih@genesyslogic.com.tw>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Add support UHS-II for GL9755 | expand

Commit Message

Victor Shih Oct. 14, 2022, 11:45 a.m. UTC

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>
Signed-off-by: Victor Shih <victor.shih@genesyslogic.com.tw>
---
 drivers/mmc/Kconfig           | 22 ----------------------
 drivers/mmc/Makefile          |  7 -------
 drivers/mmc/host/sdhci-uhs2.c |  3 +++
 drivers/mmc/host/sdhci.h      |  1 +
 4 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 drivers/mmc/Kconfig
 delete mode 100644 drivers/mmc/Makefile

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
deleted file mode 100644
index 2436eb4996a4..000000000000
--- a/drivers/mmc/Kconfig
+++ /dev/null
@@ -1,22 +0,0 @@ 
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# MMC subsystem configuration
-#
-
-menuconfig MMC
-	tristate "MMC/SD/SDIO card support"
-	depends on HAS_IOMEM
-	help
-	  This selects MultiMediaCard, Secure Digital and Secure
-	  Digital I/O support.
-
-	  If you want MMC/SD/SDIO support, you should say Y here and
-	  also to your specific host controller driver.
-
-if MMC
-
-source "drivers/mmc/core/Kconfig"
-
-source "drivers/mmc/host/Kconfig"
-
-endif # MMC
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
deleted file mode 100644
index 3ea0126a9a72..000000000000
--- a/drivers/mmc/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@ 
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Makefile for the kernel mmc device drivers.
-#
-
-obj-$(CONFIG_MMC)		+= core/
-obj-$(subst m,y,$(CONFIG_MMC))	+= host/
diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
index 8e547b672574..88decfba1880 100644
--- a/drivers/mmc/host/sdhci-uhs2.c
+++ b/drivers/mmc/host/sdhci-uhs2.c
@@ -1570,6 +1570,9 @@  static int sdhci_uhs2_do_detect_init(struct mmc_host *mmc)
 
 	DBG("%s: begin UHS2 init.\n", __func__);
 
+	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));
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index bc4be80bf0af..943701aef22a 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -745,6 +745,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

[V5,22/26] mmc: sdhci-uhs2: add pre-detect_init hook

Commit Message

Patch