From: david@lechnology.com (David Lechner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/5] mmc: davinci: don't use dma platform resources
Date: Mon, 14 Mar 2016 17:54:40 -0500 [thread overview]
Message-ID: <1457996081-21975-5-git-send-email-david@lechnology.com> (raw)
In-Reply-To: <1457996081-21975-1-git-send-email-david@lechnology.com>
The davinci arch now has dma_slave_map tables for dma resources, so it is
no longer necessary to pass dma resources through the platform device.
Signed-off-by: David Lechner <david@lechnology.com>
---
v2 changes: Remove platform_get_resource completly instead of just ignoring it.
drivers/mmc/host/davinci_mmc.c | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index 8d10a92..dc96401 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -202,7 +202,6 @@ struct mmc_davinci_host {
u32 buffer_bytes_left;
u32 bytes_left;
- u32 rxdma, txdma;
struct dma_chan *dma_tx;
struct dma_chan *dma_rx;
bool use_dma;
@@ -520,16 +519,14 @@ static int __init davinci_acquire_dma_channels(struct mmc_davinci_host *host)
dma_cap_set(DMA_SLAVE, mask);
host->dma_tx =
- dma_request_slave_channel_compat(mask, edma_filter_fn,
- &host->txdma, mmc_dev(host->mmc), "tx");
+ dma_request_slave_channel(mmc_dev(host->mmc), "tx");
if (!host->dma_tx) {
dev_err(mmc_dev(host->mmc), "Can't get dma_tx channel\n");
return -ENODEV;
}
host->dma_rx =
- dma_request_slave_channel_compat(mask, edma_filter_fn,
- &host->rxdma, mmc_dev(host->mmc), "rx");
+ dma_request_slave_channel(mmc_dev(host->mmc), "rx");
if (!host->dma_rx) {
dev_err(mmc_dev(host->mmc), "Can't get dma_rx channel\n");
r = -ENODEV;
@@ -1251,18 +1248,6 @@ static int __init davinci_mmcsd_probe(struct platform_device *pdev)
host = mmc_priv(mmc);
host->mmc = mmc; /* Important */
- r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
- if (!r)
- dev_warn(&pdev->dev, "RX DMA resource not specified\n");
- else
- host->rxdma = r->start;
-
- r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
- if (!r)
- dev_warn(&pdev->dev, "TX DMA resource not specified\n");
- else
- host->txdma = r->start;
-
host->mem_res = mem;
host->base = devm_ioremap(&pdev->dev, mem->start, mem_size);
if (!host->base)
--
1.9.1
next prev parent reply other threads:[~2016-03-14 22:54 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-09 23:50 [PATCH 0/4] davinci_mmc device tree fixes David Lechner
2016-03-09 23:50 ` [PATCH 1/4] mmc: davinci: remove matching string David Lechner
2016-03-14 13:41 ` Sekhar Nori
2016-03-09 23:50 ` [PATCH 2/4] mmc: davinci: fix unwinding in probe David Lechner
2016-03-14 11:52 ` Sekhar Nori
2016-03-09 23:50 ` [PATCH 3/4] mmc: davinci: prepare clock David Lechner
2016-03-14 11:54 ` Sekhar Nori
2016-03-14 17:09 ` David Lechner
2016-03-14 17:13 ` David Lechner
2016-03-15 5:16 ` Sekhar Nori
2016-03-09 23:50 ` [PATCH 4/4] mmc: davinci: suppress waring when using DT David Lechner
2016-03-14 13:41 ` Sekhar Nori
2016-03-14 22:54 ` [PATCH v2 0/5] davinci_mmc fixes David Lechner
2016-03-14 22:54 ` [PATCH v2 1/5] mmc: davinci: remove matching string David Lechner
2016-03-15 9:12 ` Sekhar Nori
2016-03-14 22:54 ` [PATCH v2 2/5] mmc: davinci: fix unwinding in probe David Lechner
2016-03-15 9:10 ` Sekhar Nori
2016-03-14 22:54 ` [PATCH v2 3/5] mmc: davinci: prepare clock David Lechner
2016-03-15 9:13 ` Sekhar Nori
2016-03-14 22:54 ` David Lechner [this message]
2016-03-15 8:09 ` [PATCH v2 4/5] mmc: davinci: don't use dma platform resources Sekhar Nori
2016-03-15 8:54 ` Peter Ujfalusi
2016-03-15 8:56 ` Peter Ujfalusi
2016-03-15 17:14 ` David Lechner
2016-03-16 8:46 ` Peter Ujfalusi
2016-03-14 22:54 ` [PATCH v2 5/5] arm: davinci: remove mmc dma resources David Lechner
2016-03-15 8:23 ` Sekhar Nori
2016-03-15 8:13 ` [PATCH v2 0/5] davinci_mmc fixes Sekhar Nori
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=1457996081-21975-5-git-send-email-david@lechnology.com \
--to=david@lechnology.com \
--cc=linux-arm-kernel@lists.infradead.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).