lkml.org 
[lkml]   [2013]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/63] dmaengine: ste_dma40: Don't configure runtime configurable setup during allocate
    Date
    Using the dmaengine API, allocating and configuring a channel are two
    separate actions. Here we're removing logical channel configuration from
    the channel allocating routines.

    Cc: Vinod Koul <vinod.koul@intel.com>
    Cc: Dan Williams <djbw@fb.com>
    Cc: Per Forlin <per.forlin@stericsson.com>
    Cc: Rabin Vincent <rabin@rab.in>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    ---
    drivers/dma/ste_dma40.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
    index 8bff463..34e0fb0 100644
    --- a/drivers/dma/ste_dma40.c
    +++ b/drivers/dma/ste_dma40.c
    @@ -2024,6 +2024,9 @@ static int d40_config_memcpy(struct d40_chan *d40c)
    d40c->dma_cfg = dma40_memcpy_conf_log;
    d40c->dma_cfg.dev_type = dma40_memcpy_channels[d40c->chan.chan_id];

    + d40_log_cfg(&d40c->dma_cfg,
    + &d40c->log_def.lcsp1, &d40c->log_def.lcsp3);
    +
    } else if (dma_has_cap(DMA_MEMCPY, cap) &&
    dma_has_cap(DMA_SLAVE, cap)) {
    d40c->dma_cfg = dma40_memcpy_conf_phy;
    @@ -2448,9 +2451,6 @@ static int d40_alloc_chan_resources(struct dma_chan *chan)
    d40_set_prio_realtime(d40c);

    if (chan_is_logical(d40c)) {
    - d40_log_cfg(&d40c->dma_cfg,
    - &d40c->log_def.lcsp1, &d40c->log_def.lcsp3);
    -
    if (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_MEM)
    d40c->lcpa = d40c->base->lcpa_base +
    d40c->dma_cfg.dev_type * D40_LCPA_CHAN_SIZE;
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-05-03 17:41    [W:4.074 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site