From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-mmc@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: [PATCH 4/5] mmc: renesas_sdhi: remove 4taps as a TMIO flag
Date: Tue, 3 Dec 2019 21:05:12 +0100 [thread overview]
Message-ID: <20191203200513.1758-5-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20191203200513.1758-1-wsa+renesas@sang-engineering.com>
Now that the quirks structure is accesible, we can remove the TMIO flag
for HS400 using only 4 taps. This is Renesas specific anyhow.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/mmc/host/renesas_sdhi_core.c | 8 +++-----
include/linux/mfd/tmio.h | 3 ---
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index 2c743429e1e3..8ee6298d5a51 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -350,7 +350,7 @@ static void renesas_sdhi_hs400_complete(struct tmio_mmc_host *host)
0x4 << SH_MOBILE_SDHI_SCC_DTCNTL_TAPNUM_SHIFT);
- if (host->pdata->flags & TMIO_MMC_HAVE_4TAP_HS400)
+ if (priv->quirks && priv->quirks->hs400_4taps)
sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_TAPSET,
host->tap_set / 2);
@@ -488,7 +488,8 @@ static int renesas_sdhi_select_tuning(struct tmio_mmc_host *host)
static bool renesas_sdhi_check_scc_error(struct tmio_mmc_host *host)
{
struct renesas_sdhi *priv = host_to_priv(host);
- bool use_4tap = host->pdata->flags & TMIO_MMC_HAVE_4TAP_HS400;
+ bool use_4tap = priv->quirks && priv->quirks->hs400_4taps;
+
/*
* Skip checking SCC errors when running on 4 taps in HS400 mode as
@@ -720,9 +721,6 @@ int renesas_sdhi_probe(struct platform_device *pdev,
if (quirks && quirks->hs400_disabled)
host->mmc->caps2 &= ~(MMC_CAP2_HS400 | MMC_CAP2_HS400_ES);
- if (quirks && quirks->hs400_4taps)
- mmc_data->flags |= TMIO_MMC_HAVE_4TAP_HS400;
-
/* For some SoC, we disable internal WP. GPIO may override this */
if (mmc_can_gpio_ro(host->mmc))
mmc_data->capabilities2 &= ~MMC_CAP2_NO_WRITE_PROTECT;
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h
index 739b7bf37eaa..8ba042430d8e 100644
--- a/include/linux/mfd/tmio.h
+++ b/include/linux/mfd/tmio.h
@@ -79,9 +79,6 @@
/* Some controllers have a CBSY bit */
#define TMIO_MMC_HAVE_CBSY BIT(11)
-/* Some controllers that support HS400 use 4 taps while others use 8. */
-#define TMIO_MMC_HAVE_4TAP_HS400 BIT(13)
-
int tmio_core_mmc_enable(void __iomem *cnf, int shift, unsigned long base);
int tmio_core_mmc_resume(void __iomem *cnf, int shift, unsigned long base);
void tmio_core_mmc_pwr(void __iomem *cnf, int shift, int state);
--
2.20.1
next prev parent reply other threads:[~2019-12-03 20:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 20:05 [PATCH 0/5] mmc: renesas_sdhi: prepare for recent HS400 updates Wolfram Sang
2019-12-03 20:05 ` [PATCH 1/5] mmc: renesas_sdhi: keep sorting for quirk entries Wolfram Sang
2019-12-04 9:26 ` Geert Uytterhoeven
2019-12-05 12:13 ` Yoshihiro Shimoda
2019-12-03 20:05 ` [PATCH 2/5] mmc: renesas_sdhi: make warning more precise Wolfram Sang
2019-12-04 9:27 ` Geert Uytterhoeven
2019-12-05 12:13 ` Yoshihiro Shimoda
2019-12-03 20:05 ` [PATCH 3/5] mmc: renesas_sdhi: make quirks info accessible outside probe() Wolfram Sang
2019-12-04 9:28 ` Geert Uytterhoeven
2019-12-05 12:14 ` Yoshihiro Shimoda
2019-12-03 20:05 ` Wolfram Sang [this message]
2019-12-04 9:29 ` [PATCH 4/5] mmc: renesas_sdhi: remove 4taps as a TMIO flag Geert Uytterhoeven
2019-12-04 9:47 ` Sergei Shtylyov
2019-12-05 12:16 ` Yoshihiro Shimoda
2019-12-03 20:05 ` [PATCH/RFT 5/5] mmc: renesas_sdhi: use recent tap values for HS400 Wolfram Sang
2019-12-05 12:45 ` Yoshihiro Shimoda
2019-12-10 13:09 ` [PATCH 0/5] mmc: renesas_sdhi: prepare for recent HS400 updates Ulf Hansson
2019-12-10 22:21 ` Wolfram Sang
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=20191203200513.1758-5-wsa+renesas@sang-engineering.com \
--to=wsa+renesas@sang-engineering.com \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/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).