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 50/59] dmaengine: bcm2835: 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>
    Acked-by: Stephen Warren <swarren@wwwdotorg.org>
    ---
    drivers/dma/bcm2835-dma.c | 16 ++++------------
    1 file changed, 4 insertions(+), 12 deletions(-)

    diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
    index 243bb1ed6bfc..f4f200113e0f 100644
    --- a/drivers/dma/bcm2835-dma.c
    +++ b/drivers/dma/bcm2835-dma.c
    @@ -552,18 +552,6 @@ static struct dma_chan *bcm2835_dma_xlate(struct of_phandle_args *spec,
    return chan;
    }

    -static int bcm2835_dma_device_slave_caps(struct dma_chan *dchan,
    - struct dma_slave_caps *caps)
    -{
    - caps->src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
    - caps->dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
    - caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
    - caps->cmd_pause = false;
    - caps->cmd_terminate = true;
    -
    - return 0;
    -}
    -
    static int bcm2835_dma_probe(struct platform_device *pdev)
    {
    struct bcm2835_dmadev *od;
    @@ -605,6 +593,10 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
    od->ddev.device_prep_dma_cyclic = bcm2835_dma_prep_dma_cyclic;
    od->ddev.device_config = bcm2835_dma_slave_config;
    od->ddev.device_terminate_all = bcm2835_dma_terminate_all;
    + od->ddev.generic_slave_caps = true;
    + od->ddev.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
    + od->ddev.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
    + od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
    od->ddev.dev = &pdev->dev;
    INIT_LIST_HEAD(&od->ddev.channels);
    spin_lock_init(&od->lock);
    --
    2.1.1


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