From: Adrian Hunter <adrian.hunter@intel.com>
To: Faiz Abbas <faiz_abbas@ti.com>,
linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, linux-mmc@vger.kernel.org
Cc: kishon@ti.com, mark.rutland@arm.com, robh+dt@kernel.org,
ulf.hansson@linaro.org, tony@atomide.com
Subject: Re: [PATCH v4 09/11] mmc: sdhci-omap: Add ti,needs-special-reset property
Date: Wed, 15 Jan 2020 14:14:05 +0200 [thread overview]
Message-ID: <df86859f-de3b-4419-02be-870b29b13a7a@intel.com> (raw)
In-Reply-To: <20200106110133.13791-10-faiz_abbas@ti.com>
On 6/01/20 1:01 pm, Faiz Abbas wrote:
> Some omap controllers need software to monitor a 0->1->0 for software
> reset. Add a ti,needs-special-reset property to indicate this and use
> the special_reset member to indicate when a controller needs this.
>
> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> drivers/mmc/host/sdhci-omap.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
> index 1f05c8e98d62..34df30edd450 100644
> --- a/drivers/mmc/host/sdhci-omap.c
> +++ b/drivers/mmc/host/sdhci-omap.c
> @@ -107,6 +107,7 @@ struct sdhci_omap_host {
> struct pinctrl *pinctrl;
> struct pinctrl_state **pinctrl_state;
> bool is_tuning;
> + bool special_reset;
> };
>
> static void sdhci_omap_start_clock(struct sdhci_omap_host *omap_host);
> @@ -779,15 +780,35 @@ static void sdhci_omap_set_uhs_signaling(struct sdhci_host *host,
> sdhci_omap_start_clock(omap_host);
> }
>
> +#define MMC_TIMEOUT_US 20000 /* 20000 micro Sec */
> static void sdhci_omap_reset(struct sdhci_host *host, u8 mask)
> {
> struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
> struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);
> + unsigned long limit = MMC_TIMEOUT_US;
> + unsigned long i = 0;
>
> /* Don't reset data lines during tuning operation */
> if (omap_host->is_tuning)
> mask &= ~SDHCI_RESET_DATA;
>
> + if (omap_host->special_reset) {
> + sdhci_writeb(host, mask, SDHCI_SOFTWARE_RESET);
> + while ((!(sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask)) &&
> + (i++ < limit))
> + udelay(1);
> + i = 0;
> + while ((sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask) &&
> + (i++ < limit))
> + udelay(1);
> +
> + if (sdhci_readb(host, SDHCI_SOFTWARE_RESET) & mask)
> + dev_err(mmc_dev(host->mmc),
> + "Timeout waiting on controller reset in %s\n",
> + __func__);
> + return;
> + }
> +
> sdhci_reset(host, mask);
> }
>
> @@ -1107,6 +1128,9 @@ static int sdhci_omap_probe(struct platform_device *pdev)
> if (!mmc_can_gpio_ro(mmc))
> mmc->caps2 |= MMC_CAP2_NO_WRITE_PROTECT;
>
> + if (of_find_property(dev->of_node, "ti,needs-special-reset", NULL))
> + omap_host->special_reset = true;
> +
> pltfm_host->clk = devm_clk_get(dev, "fck");
> if (IS_ERR(pltfm_host->clk)) {
> ret = PTR_ERR(pltfm_host->clk);
>
next prev parent reply other threads:[~2020-01-15 12:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-06 11:01 [PATCH v4 00/11] Port am335x and am437x devices to sdhci-omap Faiz Abbas
2020-01-06 11:01 ` [PATCH v4 01/11] dt-bindings: sdhci-omap: Add properties for using external dma Faiz Abbas
2020-01-06 11:01 ` [PATCH v4 02/11] mmc: sdhci: Factor out some operations set to their own functions Faiz Abbas
2020-01-07 6:34 ` Baolin Wang
2020-01-07 7:22 ` Faiz Abbas
2020-01-08 1:32 ` Baolin Wang
2020-01-15 10:55 ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 03/11] mmc: sdhci: add support for using external DMA devices Faiz Abbas
2020-01-08 1:28 ` Baolin Wang
2020-01-08 9:20 ` Faiz Abbas
2020-01-08 9:29 ` Baolin Wang
2020-01-08 13:35 ` Peter Ujfalusi
2020-01-10 13:16 ` Faiz Abbas
2020-01-15 12:01 ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 04/11] mmc: sdhci-omap: Add using external dma Faiz Abbas
2020-01-15 12:02 ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 05/11] mmc: sdhci: Convert sdhci_set_timeout_irq() to non-static Faiz Abbas
2020-01-15 12:03 ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 06/11] mmc: sdhci: Refactor sdhci_set_timeout() Faiz Abbas
2020-01-15 12:04 ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 07/11] mmc: sdhci-omap: Disable data timeout interrupt during erase Faiz Abbas
2020-01-15 12:05 ` Adrian Hunter
2020-01-06 11:01 ` [PATCH v4 08/11] dt-bindings: sdhci-omap: Add documentation for ti,needs-special-reset property Faiz Abbas
2020-01-06 22:03 ` Rob Herring
2020-01-07 11:18 ` Faiz Abbas
2020-01-06 11:01 ` [PATCH v4 09/11] mmc: sdhci-omap: Add " Faiz Abbas
2020-01-15 12:14 ` Adrian Hunter [this message]
2020-01-06 11:01 ` [PATCH v4 10/11] dt-bindings: sdhci-omap: Add am335x and am437x specific bindings Faiz Abbas
2020-01-06 11:01 ` [PATCH v4 11/11] mmc: sdhci-omap: Add am335x and am437x specific compatibles Faiz Abbas
2020-01-15 12:14 ` Adrian Hunter
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=df86859f-de3b-4419-02be-870b29b13a7a@intel.com \
--to=adrian.hunter@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=faiz_abbas@ti.com \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
--cc=ulf.hansson@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).