lkml.org 
[lkml]   [2012]   [Jan]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] dma/imx-sdma: move clk_enable out of sdma_request_channel
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
>
>


\
 
 \ /
  Last update: 2012-01-10 04:01    [W:0.139 / U:0.208 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site