From: Ulf Hansson <ulf.hansson@linaro.org>
To: linux-mmc@vger.kernel.org, Ulf Hansson <ulf.hansson@linaro.org>,
Adrian Hunter <adrian.hunter@intel.com>
Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>,
Ben Chuang <ben.chuang@genesyslogic.com.tw>,
greg.tu@genesyslogic.com.tw, Renius Chen <reniuschengl@gmail.com>,
Masami Hiramatsu <masami.hiramatsu@linaro.org>,
Takao Orito <orito.takao@socionext.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] mmc: core: Announce successful insertion of an SD UHS-II card
Date: Thu, 25 Feb 2021 18:03:51 +0100 [thread overview]
Message-ID: <20210225170352.76872-4-ulf.hansson@linaro.org> (raw)
In-Reply-To: <20210225170352.76872-1-ulf.hansson@linaro.org>
To inform the users about SD UHS-II cards, let's extend the print at card
insertion with a "UHS-II" substring. Within this change, it seems
reasonable to convert from using "ultra high speed" into "UHS-I speed", for
the UHS-I type, as it should makes it more clear.
Note that, the new print for UHS-II cards doesn't include the actual
selected speed mode. Instead, this is going to be added from subsequent
change.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/mmc/core/bus.c | 4 +++-
drivers/mmc/core/host.h | 5 +++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index f4851ec8290c..887b0b80ac3f 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -353,7 +353,9 @@ int mmc_add_card(struct mmc_card *card)
if (mmc_card_hs(card))
speed_mode = "high speed ";
else if (mmc_card_uhs(card))
- speed_mode = "ultra high speed ";
+ speed_mode = "UHS-I speed ";
+ else if (mmc_card_uhs2(card))
+ speed_mode = "UHS-II speed ";
else if (mmc_card_ddr52(card))
speed_mode = "high speed DDR ";
else if (mmc_card_hs200(card))
diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h
index ba407617ed23..76cb024a0868 100644
--- a/drivers/mmc/core/host.h
+++ b/drivers/mmc/core/host.h
@@ -83,5 +83,10 @@ static inline bool mmc_card_sd_express(struct mmc_host *host)
host->ios.timing == MMC_TIMING_SD_EXP_1_2V;
}
+static inline bool mmc_card_uhs2(struct mmc_card *card)
+{
+ return card->host->ios.timing == MMC_TIMING_SD_UHS2;
+}
+
#endif
--
2.25.1
next prev parent reply other threads:[~2021-02-25 17:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 17:03 [PATCH 0/4] mmc: core: Preparations to support SD UHS-II cards Ulf Hansson
2021-02-25 17:03 ` [PATCH 1/4] mmc: core: Cleanup printing of speed mode at card insertion Ulf Hansson
2021-02-25 17:03 ` [PATCH 2/4] mmc: core: Prepare to support SD UHS-II cards Ulf Hansson
2021-02-25 17:03 ` Ulf Hansson [this message]
2021-02-25 17:03 ` [PATCH 4/4] mmc: core: Extend support for mmc regulators with a vqmmc2 Ulf Hansson
2021-03-31 9:57 ` [PATCH 0/4] mmc: core: Preparations to support SD UHS-II cards Ulf Hansson
2021-03-31 10:26 ` ReniusChen[陳建宏]
2021-03-31 10:31 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210225170352.76872-4-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=adrian.hunter@intel.com \
--cc=ben.chuang@genesyslogic.com.tw \
--cc=greg.tu@genesyslogic.com.tw \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=masami.hiramatsu@linaro.org \
--cc=orito.takao@socionext.com \
--cc=reniuschengl@gmail.com \
--cc=takahiro.akashi@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).