lkml.org 
[lkml]   [2014]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 55/59] dmaengine: pl330: Declare slave capabilities for the generic code
    Date
    Now that the generic slave caps code can make use of the device assigned
    capabilities, instead of relying on a callback to be implemented.

    Make use of this code.

    Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
    ---
    drivers/dma/pl330.c | 19 +++++--------------
    1 file changed, 5 insertions(+), 14 deletions(-)

    diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
    index bd0e47eefa34..b0bf5d240219 100644
    --- a/drivers/dma/pl330.c
    +++ b/drivers/dma/pl330.c
    @@ -2569,19 +2569,6 @@ static irqreturn_t pl330_irq_handler(int irq, void *data)
    BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | \
    BIT(DMA_SLAVE_BUSWIDTH_8_BYTES)

    -static int pl330_dma_device_slave_caps(struct dma_chan *dchan,
    - struct dma_slave_caps *caps)
    -{
    - caps->src_addr_widths = PL330_DMA_BUSWIDTHS;
    - caps->dst_addr_widths = PL330_DMA_BUSWIDTHS;
    - caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
    - caps->cmd_pause = false;
    - caps->cmd_terminate = true;
    - caps->residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR;
    -
    - return 0;
    -}
    -
    static int
    pl330_probe(struct amba_device *adev, const struct amba_id *id)
    {
    @@ -2701,7 +2688,11 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
    pd->device_config = pl330_config;
    pd->device_terminate_all = pl330_terminate_all;
    pd->device_issue_pending = pl330_issue_pending;
    - pd->device_slave_caps = pl330_dma_device_slave_caps;
    + pd->src_addr_widths = PL330_DMA_BUSWIDTHS;
    + pd->dst_addr_widths = PL330_DMA_BUSWIDTHS;
    + pd->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
    + pd->residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR;
    + pd->generic_slave_caps = true;

    ret = dma_async_device_register(pd);
    if (ret) {
    --
    2.1.1


    \
     
     \ /
      Last update: 2014-10-22 18:21    [W:3.080 / U:0.472 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site