Skip to content

Commit

Permalink
dma/imx-sdma: move clk_enable out of sdma_request_channel
Browse files Browse the repository at this point in the history
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 clock.

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
[fixed typo in commit log]
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
  • Loading branch information
Richard Zhao authored and Vinod Koul committed Jan 31, 2012
1 parent 3bb5e7c commit c2c744d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -873,6 +871,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;
Expand Down

0 comments on commit c2c744d

Please sign in to comment.