From: Faiz Abbas <faiz_abbas@ti.com>
To: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-mmc@vger.kernel.org>, <adrian.hunter@intel.com>,
<will@kernel.org>, <catalin.marinas@arm.com>,
<robh+dt@kernel.org>, <ulf.hansson@linaro.org>
Cc: <faiz_abbas@ti.com>
Subject: [PATCH 4/7] mmc: sdhci_am654: Fix conditions for enabling dll
Date: Fri, 19 Jun 2020 18:27:58 +0530 [thread overview]
Message-ID: <20200619125801.9530-5-faiz_abbas@ti.com> (raw)
In-Reply-To: <20200619125801.9530-1-faiz_abbas@ti.com>
The clock > CLOCK_TOO_SLOW_HZ condition gating phy configuration
is only required because dll should not be enabled at too low a
clock frequency or too low timing. Make sure that this condition
only gates dll enablement.
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---
drivers/mmc/host/sdhci_am654.c | 42 ++++++++++++++++------------------
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c
index 365eb2819dd9..8b0f69012d09 100644
--- a/drivers/mmc/host/sdhci_am654.c
+++ b/drivers/mmc/host/sdhci_am654.c
@@ -204,34 +204,32 @@ static void sdhci_am654_set_clock(struct sdhci_host *host, unsigned int clock)
sdhci_set_clock(host, clock);
- if (clock > CLOCK_TOO_SLOW_HZ) {
- /* Setup DLL Output TAP delay */
- if (sdhci_am654->legacy_otapdly)
- otap_del_sel = sdhci_am654->otap_del_sel[0];
- else
- otap_del_sel = sdhci_am654->otap_del_sel[timing];
+ /* Setup DLL Output TAP delay */
+ if (sdhci_am654->legacy_otapdly)
+ otap_del_sel = sdhci_am654->otap_del_sel[0];
+ else
+ otap_del_sel = sdhci_am654->otap_del_sel[timing];
- otap_del_ena = (timing > MMC_TIMING_UHS_SDR25) ? 1 : 0;
+ otap_del_ena = (timing > MMC_TIMING_UHS_SDR25) ? 1 : 0;
- mask = OTAPDLYENA_MASK | OTAPDLYSEL_MASK;
- val = (otap_del_ena << OTAPDLYENA_SHIFT) |
- (otap_del_sel << OTAPDLYSEL_SHIFT);
+ mask = OTAPDLYENA_MASK | OTAPDLYSEL_MASK;
+ val = (otap_del_ena << OTAPDLYENA_SHIFT) |
+ (otap_del_sel << OTAPDLYSEL_SHIFT);
- /* Write to STRBSEL for HS400 speed mode */
- if (timing == MMC_TIMING_MMC_HS400) {
- if (sdhci_am654->flags & STRBSEL_4_BIT)
- mask |= STRBSEL_4BIT_MASK;
- else
- mask |= STRBSEL_8BIT_MASK;
+ /* Write to STRBSEL for HS400 speed mode */
+ if (timing == MMC_TIMING_MMC_HS400) {
+ if (sdhci_am654->flags & STRBSEL_4_BIT)
+ mask |= STRBSEL_4BIT_MASK;
+ else
+ mask |= STRBSEL_8BIT_MASK;
- val |= sdhci_am654->strb_sel << STRBSEL_SHIFT;
- }
+ val |= sdhci_am654->strb_sel << STRBSEL_SHIFT;
+ }
- regmap_update_bits(sdhci_am654->base, PHY_CTRL4, mask, val);
+ regmap_update_bits(sdhci_am654->base, PHY_CTRL4, mask, val);
- if (timing > MMC_TIMING_UHS_SDR25)
- sdhci_am654_setup_dll(host, clock);
- }
+ if (timing > MMC_TIMING_UHS_SDR25 && clock > CLOCK_TOO_SLOW_HZ)
+ sdhci_am654_setup_dll(host, clock);
}
static void sdhci_j721e_4bit_set_clock(struct sdhci_host *host,
--
2.17.1
next prev parent reply other threads:[~2020-06-19 12:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-19 12:57 [PATCH 0/7] Add support for SD card in AM654x-evm Faiz Abbas
2020-06-19 12:57 ` [PATCH 1/7] dt-bindings: mmc: sdhci-am654: Add ti,clkbuf-sel binding Faiz Abbas
2020-06-19 12:57 ` [PATCH 2/7] mmc: sdhci_am654: Add flag for PHY calibration Faiz Abbas
2020-06-19 12:57 ` [PATCH 3/7] mmc: sdhci_am654: Add Support for SR2.0 Faiz Abbas
2020-06-19 12:57 ` Faiz Abbas [this message]
2020-06-19 12:57 ` [PATCH 5/7] mmc: sdhci_am654: Update delay chain configuration Faiz Abbas
2020-06-19 12:58 ` [PATCH 6/7] mmc: sdhci_am654: Add support for clkbuf_sel property Faiz Abbas
2020-06-19 12:58 ` [PATCH 7/7] arm64: defconfig: Enable AM654x SDHCI controller Faiz Abbas
2020-07-16 12:19 ` Faiz Abbas
2020-07-16 13:25 ` Sekhar Nori
2020-07-16 18:28 ` Arnd Bergmann
2020-07-17 8:38 ` Faiz Abbas
2020-07-17 11:20 ` Tero Kristo
2020-07-17 13:09 ` Arnd Bergmann
2020-07-17 13:36 ` Faiz Abbas
2020-07-17 13:43 ` Tero Kristo
2020-07-03 7:27 ` [PATCH 0/7] Add support for SD card in AM654x-evm Faiz Abbas
2020-07-06 14:48 ` 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=20200619125801.9530-5-faiz_abbas@ti.com \
--to=faiz_abbas@ti.com \
--cc=adrian.hunter@intel.com \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=will@kernel.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).