* [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel
@ 2012-01-09 8:48 Richard Zhao
2012-01-09 8:49 ` [PATCH 2/2] dma/imx-sdma: move clk_enable out of sdma_request_channel Richard Zhao
2012-01-10 3:02 ` [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel Shawn Guo
0 siblings, 2 replies; 5+ messages in thread
From: Richard Zhao @ 2012-01-09 8:48 UTC (permalink / raw)
To: linux-kernel, linux-arm-kernel
Cc: dan.j.williams, vinod.koul, shawn.guo, kernel, eric.miao,
patches, Richard Zhao
sdma_request_channel sets the default priority. sdma_alloc_chan_resources
should call sdma_set_channel_priority thereafter to over write it.
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
drivers/dma/imx-sdma.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 2cc96c4..6376009 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -875,11 +875,11 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
sdmac->peripheral_type = data->peripheral_type;
sdmac->event_id0 = data->dma_request;
- ret = sdma_set_channel_priority(sdmac, prio);
+ ret = sdma_request_channel(sdmac);
if (ret)
return ret;
- ret = sdma_request_channel(sdmac);
+ ret = sdma_set_channel_priority(sdmac, prio);
if (ret)
return ret;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] dma/imx-sdma: move clk_enable out of sdma_request_channel
2012-01-09 8:48 [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel Richard Zhao
@ 2012-01-09 8:49 ` Richard Zhao
2012-01-10 3:09 ` Shawn Guo
2012-01-10 3:02 ` [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel Shawn Guo
1 sibling, 1 reply; 5+ messages in thread
From: Richard Zhao @ 2012-01-09 8:49 UTC (permalink / raw)
To: linux-kernel, linux-arm-kernel
Cc: dan.j.williams, vinod.koul, shawn.guo, kernel, eric.miao,
patches, Richard Zhao
It makes clk_enable/disable pair more readable, and fix one bug:
sdma_init calls sdma_request_channel, but seems don't know
sdma_request_channel enabled the clok.
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
drivers/dma/imx-sdma.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 6376009..2a0e02d 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -802,8 +802,6 @@ static int sdma_request_channel(struct sdma_channel *sdmac)
sdma->channel_control[channel].base_bd_ptr = sdmac->bd_phys;
sdma->channel_control[channel].current_bd_ptr = sdmac->bd_phys;
- clk_enable(sdma->clk);
-
sdma_set_channel_priority(sdmac, MXC_SDMA_DEFAULT_PRIORITY);
init_completion(&sdmac->done);
@@ -875,6 +873,9 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
sdmac->peripheral_type = data->peripheral_type;
sdmac->event_id0 = data->dma_request;
+
+ clk_enable(sdmac->sdma->clk);
+
ret = sdma_request_channel(sdmac);
if (ret)
return ret;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] dma/imx-sdma: move clk_enable out of sdma_request_channel
2012-01-09 8:49 ` [PATCH 2/2] dma/imx-sdma: move clk_enable out of sdma_request_channel Richard Zhao
@ 2012-01-10 3:09 ` Shawn Guo
0 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2012-01-10 3:09 UTC (permalink / raw)
To: Richard Zhao
Cc: linux-kernel, linux-arm-kernel, dan.j.williams, vinod.koul,
kernel, eric.miao, patches
On Mon, Jan 09, 2012 at 04:49:00PM +0800, Richard Zhao wrote:
> It makes clk_enable/disable pair more readable, and fix one bug:
> sdma_init calls sdma_request_channel, but seems don't know
> sdma_request_channel enabled the clok.
>
> Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Since clk_disable is being called in sdma_free_chan_resources, it's
generally a good idea to call clk_enable in sdma_alloc_chan_resources.
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Regards,
Shawn
> ---
> drivers/dma/imx-sdma.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index 6376009..2a0e02d 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -802,8 +802,6 @@ static int sdma_request_channel(struct sdma_channel *sdmac)
> sdma->channel_control[channel].base_bd_ptr = sdmac->bd_phys;
> sdma->channel_control[channel].current_bd_ptr = sdmac->bd_phys;
>
> - clk_enable(sdma->clk);
> -
> sdma_set_channel_priority(sdmac, MXC_SDMA_DEFAULT_PRIORITY);
>
> init_completion(&sdmac->done);
> @@ -875,6 +873,9 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
>
> sdmac->peripheral_type = data->peripheral_type;
> sdmac->event_id0 = data->dma_request;
> +
> + clk_enable(sdmac->sdma->clk);
> +
> ret = sdma_request_channel(sdmac);
> if (ret)
> return ret;
> --
> 1.7.5.4
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel
2012-01-09 8:48 [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel Richard Zhao
2012-01-09 8:49 ` [PATCH 2/2] dma/imx-sdma: move clk_enable out of sdma_request_channel Richard Zhao
@ 2012-01-10 3:02 ` Shawn Guo
2012-01-10 6:34 ` Richard Zhao
1 sibling, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2012-01-10 3:02 UTC (permalink / raw)
To: Richard Zhao
Cc: linux-kernel, linux-arm-kernel, dan.j.williams, vinod.koul,
kernel, eric.miao, patches
On Mon, Jan 09, 2012 at 04:48:59PM +0800, Richard Zhao wrote:
> sdma_request_channel sets the default priority. sdma_alloc_chan_resources
> should call sdma_set_channel_priority thereafter to over write it.
>
> Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Regards,
Shawn
> ---
> drivers/dma/imx-sdma.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index 2cc96c4..6376009 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -875,11 +875,11 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
>
> sdmac->peripheral_type = data->peripheral_type;
> sdmac->event_id0 = data->dma_request;
> - ret = sdma_set_channel_priority(sdmac, prio);
> + ret = sdma_request_channel(sdmac);
> if (ret)
> return ret;
>
> - ret = sdma_request_channel(sdmac);
> + ret = sdma_set_channel_priority(sdmac, prio);
> if (ret)
> return ret;
>
> --
> 1.7.5.4
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel
2012-01-10 3:02 ` [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel Shawn Guo
@ 2012-01-10 6:34 ` Richard Zhao
0 siblings, 0 replies; 5+ messages in thread
From: Richard Zhao @ 2012-01-10 6:34 UTC (permalink / raw)
To: Shawn Guo
Cc: Richard Zhao, patches, vinod.koul, linux-kernel, eric.miao,
kernel, dan.j.williams, linux-arm-kernel
To avoid merge conflicts, I'll send the patch series again with
other prior sdma patch.
Thanks
Richard
On Tue, Jan 10, 2012 at 11:02:25AM +0800, Shawn Guo wrote:
> On Mon, Jan 09, 2012 at 04:48:59PM +0800, Richard Zhao wrote:
> > sdma_request_channel sets the default priority. sdma_alloc_chan_resources
> > should call sdma_set_channel_priority thereafter to over write it.
> >
> > Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
>
> Acked-by: Shawn Guo <shawn.guo@linaro.org>
>
> Regards,
> Shawn
>
> > ---
> > drivers/dma/imx-sdma.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> > index 2cc96c4..6376009 100644
> > --- a/drivers/dma/imx-sdma.c
> > +++ b/drivers/dma/imx-sdma.c
> > @@ -875,11 +875,11 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
> >
> > sdmac->peripheral_type = data->peripheral_type;
> > sdmac->event_id0 = data->dma_request;
> > - ret = sdma_set_channel_priority(sdmac, prio);
> > + ret = sdma_request_channel(sdmac);
> > if (ret)
> > return ret;
> >
> > - ret = sdma_request_channel(sdmac);
> > + ret = sdma_set_channel_priority(sdmac, prio);
> > if (ret)
> > return ret;
> >
> > --
> > 1.7.5.4
> >
> >
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-01-10 6:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-09 8:48 [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel Richard Zhao
2012-01-09 8:49 ` [PATCH 2/2] dma/imx-sdma: move clk_enable out of sdma_request_channel Richard Zhao
2012-01-10 3:09 ` Shawn Guo
2012-01-10 3:02 ` [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel Shawn Guo
2012-01-10 6:34 ` Richard Zhao
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).