From: Faiz Abbas <faiz_abbas@ti.com>
To: <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-mmc@vger.kernel.org>
Cc: <zhang.chunyan@linaro.org>, <kishon@ti.com>,
<adrian.hunter@intel.com>, <mark.rutland@arm.com>,
<robh+dt@kernel.org>, <ulf.hansson@linaro.org>,
<faiz_abbas@ti.com>
Subject: [PATCH 2/7] mmc: sdhci-omap: Add using external dma
Date: Fri, 11 Jan 2019 16:38:46 +0530 [thread overview]
Message-ID: <20190111110851.6805-3-faiz_abbas@ti.com> (raw)
In-Reply-To: <20190111110851.6805-1-faiz_abbas@ti.com>
From: Chunyan Zhang <zhang.chunyan@linaro.org>
sdhci-omap can support both external dma controller via dmaengine framework
as well as ADMA which standard SD host controller provides.
Fixes by Faiz Abbas <fazi_abbas@ti.com>:
1. Switch to DMA slave mode when using external DMA
2. Add offset to mapbase
Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---
drivers/mmc/host/Kconfig | 1 +
drivers/mmc/host/sdhci-omap.c | 16 +++++++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 333292e8ecdd..70e90b00cb37 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -979,6 +979,7 @@ config MMC_SDHCI_OMAP
depends on MMC_SDHCI_PLTFM && OF
select THERMAL
select TI_SOC_THERMAL
+ select MMC_SDHCI_EXTERNAL_DMA if DMA_ENGINE
help
This selects the Secure Digital Host Controller Interface (SDHCI)
support present in TI's DRA7 SOCs. The controller supports
diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
index c11c18a9aacb..8a05e94fe612 100644
--- a/drivers/mmc/host/sdhci-omap.c
+++ b/drivers/mmc/host/sdhci-omap.c
@@ -696,7 +696,11 @@ static int sdhci_omap_enable_dma(struct sdhci_host *host)
struct sdhci_omap_host *omap_host = sdhci_pltfm_priv(pltfm_host);
reg = sdhci_omap_readl(omap_host, SDHCI_OMAP_CON);
- reg |= CON_DMA_MASTER;
+ reg &= ~CON_DMA_MASTER;
+ /* Switch to DMA slave mode when using external DMA */
+ if (!host->use_external_dma)
+ reg |= CON_DMA_MASTER;
+
sdhci_omap_writel(omap_host, SDHCI_OMAP_CON, reg);
return 0;
@@ -1010,6 +1014,7 @@ static int sdhci_omap_probe(struct platform_device *pdev)
const struct of_device_id *match;
struct sdhci_omap_data *data;
const struct soc_device_attribute *soc;
+ struct resource *regs;
match = of_match_device(omap_sdhci_match, dev);
if (!match)
@@ -1022,6 +1027,10 @@ static int sdhci_omap_probe(struct platform_device *pdev)
}
offset = data->offset;
+ regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!regs)
+ return -ENXIO;
+
host = sdhci_pltfm_init(pdev, &sdhci_omap_pdata,
sizeof(*omap_host));
if (IS_ERR(host)) {
@@ -1038,6 +1047,7 @@ static int sdhci_omap_probe(struct platform_device *pdev)
omap_host->timing = MMC_TIMING_LEGACY;
omap_host->flags = data->flags;
host->ioaddr += offset;
+ host->mapbase = regs->start + offset;
mmc = host->mmc;
sdhci_get_of_property(pdev);
@@ -1105,6 +1115,10 @@ static int sdhci_omap_probe(struct platform_device *pdev)
host->mmc_host_ops.execute_tuning = sdhci_omap_execute_tuning;
host->mmc_host_ops.enable_sdio_irq = sdhci_omap_enable_sdio_irq;
+ /* Switch to external DMA only if there is the "dmas" property */
+ if (of_find_property(dev->of_node, "dmas", NULL))
+ sdhci_switch_external_dma(host, true);
+
ret = sdhci_setup_host(host);
if (ret)
goto err_put_sync;
--
2.19.2
next prev parent reply other threads:[~2019-01-11 11:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-11 11:08 [PATCH 0/7] Port am335 and am437 devices to sdhci-omap Faiz Abbas
2019-01-11 11:08 ` [PATCH 1/7] mmc: sdhci: add support for using external DMA devices Faiz Abbas
2019-01-14 8:45 ` Adrian Hunter
2019-01-24 11:40 ` Adrian Hunter
2019-01-28 10:20 ` Chunyan Zhang
2019-01-28 10:43 ` Faiz Abbas
2019-01-28 11:46 ` Chunyan Zhang
2019-01-29 11:53 ` Faiz Abbas
2019-01-30 5:01 ` Chunyan Zhang
2019-01-30 11:05 ` Chunyan Zhang
2019-01-31 12:32 ` Faiz Abbas
2019-02-11 12:23 ` Faiz Abbas
2019-01-11 11:08 ` Faiz Abbas [this message]
2019-01-11 11:08 ` [PATCH 3/7] dt-bindings: sdhci-omap: Add example for using external dma Faiz Abbas
2019-01-21 23:20 ` Rob Herring
2019-01-22 8:47 ` [PATCH] dt-bindings: sdhci-omap: Add properties " Chunyan Zhang
2019-01-22 10:20 ` Faiz Abbas
2019-01-23 2:44 ` Chunyan Zhang
2019-01-11 11:08 ` [PATCH 4/7] mmc: sdhci: Add quirk for disabling DTO during erase command Faiz Abbas
2019-01-24 12:08 ` Adrian Hunter
2019-01-28 11:19 ` Faiz Abbas
2019-01-11 11:08 ` [PATCH 5/7] mmc: sdhci-omap: Add DISABLE_DTO_FOR_ERASE Quirk Faiz Abbas
2019-01-11 11:08 ` [PATCH 6/7] dt-bindings: sdhci-omap: Add am335x and am437x specific bindings Faiz Abbas
2019-01-21 23:21 ` Rob Herring
2019-01-11 11:08 ` [PATCH 7/7] mmc: sdhci-omap: Add am335x and am437x specific compatibles Faiz Abbas
2019-01-24 9:44 ` [PATCH 0/7] Port am335 and am437 devices to sdhci-omap Faiz Abbas
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=20190111110851.6805-3-faiz_abbas@ti.com \
--to=faiz_abbas@ti.com \
--cc=adrian.hunter@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=zhang.chunyan@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).