From: Sahitya Tummala <stummala@codeaurora.org>
To: davidb@codeaurora.org, dwalker@fifo99.com, bryanh@codeaurora.org
Cc: linux-mmc@vger.kernel.org, linux-arm-msm@vger.kernel.org,
san@google.com, Subhash Jadavani <subhashj@codeaurora.org>,
Sahitya Tummala <stummala@codeaurora.org>
Subject: [PATCH 7/7] mmc: msm_sdcc: Handle dma resource not present case
Date: Tue, 26 Apr 2011 11:04:26 +0530 [thread overview]
Message-ID: <1303796066-6784-7-git-send-email-stummala@codeaurora.org> (raw)
In-Reply-To: <1303796066-6784-1-git-send-email-stummala@codeaurora.org>
From: Subhash Jadavani <subhashj@codeaurora.org>
If DMA resource is not available then SDCC driver
should atleast work in PIO data transfer mode.
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
---
drivers/mmc/host/msm_sdcc.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 36fded7..a7d7b5e 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1233,9 +1233,13 @@ msmsdcc_probe(struct platform_device *pdev)
/*
* Setup DMA
*/
- ret = msmsdcc_init_dma(host);
- if (ret)
- goto ioremap_free;
+ if (host->dmares) {
+ ret = msmsdcc_init_dma(host);
+ if (ret)
+ goto ioremap_free;
+ } else {
+ host->dma.channel = -1;
+ }
/* Get our clocks */
host->pclk = clk_get(&pdev->dev, "sdc_pclk");
@@ -1379,8 +1383,9 @@ msmsdcc_probe(struct platform_device *pdev)
pclk_put:
clk_put(host->pclk);
dma_free:
- dma_free_coherent(NULL, sizeof(struct msmsdcc_nc_dmadata),
- host->dma.nc, host->dma.nc_busaddr);
+ if (host->dmares)
+ dma_free_coherent(NULL, sizeof(struct msmsdcc_nc_dmadata),
+ host->dma.nc, host->dma.nc_busaddr);
ioremap_free:
tasklet_kill(&host->dma_tlet);
iounmap(host->base);
--
1.7.1
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
next prev parent reply other threads:[~2011-04-26 5:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-26 5:34 [PATCH 1/7] mmc: msm_sdcc: handle the platform gpio_data not present case Sahitya Tummala
2011-04-26 5:34 ` [PATCH 2/7] mmc: msm_sdcc: Handle error cases in probe Sahitya Tummala
2011-05-02 12:36 ` [PATCH V2 " Sahitya Tummala
2011-04-26 5:34 ` [PATCH 3/7] mmc: msm_sdcc: Enable SDC host->clk only after setting the rate Sahitya Tummala
2011-05-02 12:37 ` [PATCH V2 " Sahitya Tummala
2011-04-26 5:34 ` [PATCH 4/7] msm: mmc: Remove "pio_irq" resource Sahitya Tummala
2011-05-02 12:37 ` [PATCH V2 " Sahitya Tummala
2011-04-26 5:34 ` [PATCH 5/7] mmc: msm_sdcc: Use MCI_INT_MASK0 for PIO interrupts Sahitya Tummala
2011-04-27 15:52 ` Stephen Boyd
2011-05-02 12:39 ` [PATCH V2 " Sahitya Tummala
2011-04-26 5:34 ` [PATCH 6/7] mmc: msm_sdcc: Change initialization order of busclk_timer in probe Sahitya Tummala
2011-05-02 12:40 ` [PATCH V2 " Sahitya Tummala
2011-04-26 5:34 ` Sahitya Tummala [this message]
2011-05-02 12:40 ` [PATCH V2 7/7] mmc: msm_sdcc: Handle dma resource not present case Sahitya Tummala
2011-05-02 12:33 ` [PATCH V2 1/7] mmc: msm_sdcc: handle the platform gpio_data " Sahitya Tummala
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=1303796066-6784-7-git-send-email-stummala@codeaurora.org \
--to=stummala@codeaurora.org \
--cc=bryanh@codeaurora.org \
--cc=davidb@codeaurora.org \
--cc=dwalker@fifo99.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=san@google.com \
--cc=subhashj@codeaurora.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.