From: Richard Zhao <richard.zhao@linaro.org>
To: <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>
Cc: <dan.j.williams@intel.com>, <vinod.koul@intel.com>,
<shawn.guo@linaro.org>, <kernel@pengutronix.de>,
<eric.miao@linaro.org>, <patches@linaro.org>,
Richard Zhao <richard.zhao@linaro.org>
Subject: [PATCH 1/6] dma/imx-sdma: let sdma_run_channel call sdma_enable_channel
Date: Tue, 10 Jan 2012 15:01:45 +0800 [thread overview]
Message-ID: <1326178910-14044-1-git-send-email-richard.zhao@linaro.org> (raw)
Let all enable channel code call sdma_enable_channel.
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/dma/imx-sdma.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index f59fd8f..c2bc4f1 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -394,6 +394,11 @@ static int sdma_config_ownership(struct sdma_channel *sdmac,
return 0;
}
+static void sdma_enable_channel(struct sdma_engine *sdma, int channel)
+{
+ __raw_writel(1 << channel, sdma->regs + SDMA_H_START);
+}
+
/*
* sdma_run_channel - run a channel and wait till it's done
*/
@@ -405,7 +410,7 @@ static int sdma_run_channel(struct sdma_channel *sdmac)
init_completion(&sdmac->done);
- __raw_writel(1 << channel, sdma->regs + SDMA_H_START);
+ sdma_enable_channel(sdma, channel);
ret = wait_for_completion_timeout(&sdmac->done, HZ);
@@ -811,11 +816,6 @@ out:
return ret;
}
-static void sdma_enable_channel(struct sdma_engine *sdma, int channel)
-{
- __raw_writel(1 << channel, sdma->regs + SDMA_H_START);
-}
-
static dma_cookie_t sdma_assign_cookie(struct sdma_channel *sdmac)
{
dma_cookie_t cookie = sdmac->chan.cookie;
--
1.7.5.4
next reply other threads:[~2012-01-10 7:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-10 7:01 Richard Zhao [this message]
2012-01-10 7:01 ` [PATCH 2/6] dma/imx-sdma: use readl_relaxed/writel_relaxed and use writel when necessary Richard Zhao
2012-01-10 7:01 ` [PATCH 3/6] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel Richard Zhao
2012-01-10 7:01 ` [PATCH 4/6] dma/imx-sdma: move clk_enable out of sdma_request_channel Richard Zhao
2012-01-10 7:01 ` [PATCH 5/6] dma/imx-sdma: use num_events to validate event_id0 Richard Zhao
2012-01-10 14:02 ` Dirk Behme
2012-01-10 14:16 ` Shawn Guo
2012-01-10 7:01 ` [PATCH 6/6] dma/imx-sdma: check whether event_id0 < 32 when set event_mask Richard Zhao
2012-01-10 14:20 ` Shawn Guo
2012-01-10 14:29 ` Richard Zhao
2012-01-10 15:38 ` Shawn Guo
2012-01-11 0:53 ` Richard Zhao
2012-01-11 1:47 ` Richard Zhao
2012-01-11 6:37 ` Eric Miao
2012-01-11 12:35 ` Richard Zhao
2012-01-11 12:53 ` Richard Zhao
2012-01-12 14:23 ` Richard Zhao
2012-01-11 13:16 ` Shawn Guo
2012-01-11 13:09 ` Richard Zhao
2012-01-11 13:35 ` Shawn Guo
2012-01-11 13:48 ` Eric Miao
2012-01-11 13:11 ` Shawn Guo
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=1326178910-14044-1-git-send-email-richard.zhao@linaro.org \
--to=richard.zhao@linaro.org \
--cc=dan.j.williams@intel.com \
--cc=eric.miao@linaro.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@linaro.org \
--cc=shawn.guo@linaro.org \
--cc=vinod.koul@intel.com \
/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).