lkml.org 
[lkml]   [2019]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -next 5/6] dmaengine: xilinx_dma: Extend dma_config struct to store irq routine handle
    Date
    Extend dma_config structure to store irq routine handle. It enables runtime
    handler selection based on xdma_ip_type and serves as preparatory patch for
    adding MCDMA IP support.

    Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
    Suggested-by: Vinod Koul <vkoul@kernel.org>
    ---
    Changes since RFC:
    New patch. It serve as a preparatory patch for MCDMA driver support.
    ---
    drivers/dma/xilinx/xilinx_dma.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c
    index 6d45865..25042a9 100644
    --- a/drivers/dma/xilinx/xilinx_dma.c
    +++ b/drivers/dma/xilinx/xilinx_dma.c
    @@ -391,6 +391,7 @@ struct xilinx_dma_config {
    int (*clk_init)(struct platform_device *pdev, struct clk **axi_clk,
    struct clk **tx_clk, struct clk **txs_clk,
    struct clk **rx_clk, struct clk **rxs_clk);
    + irqreturn_t (*irq_handler)(int irq, void *data);
    };

    /**
    @@ -2402,8 +2403,8 @@ static int xilinx_dma_chan_probe(struct xilinx_dma_device *xdev,

    /* Request the interrupt */
    chan->irq = irq_of_parse_and_map(node, 0);
    - err = request_irq(chan->irq, xilinx_dma_irq_handler, IRQF_SHARED,
    - "xilinx-dma-controller", chan);
    + err = request_irq(chan->irq, xdev->dma_config->irq_handler,
    + IRQF_SHARED, "xilinx-dma-controller", chan);
    if (err) {
    dev_err(xdev->dev, "unable to request IRQ %d\n", chan->irq);
    return err;
    @@ -2497,16 +2498,19 @@ static struct dma_chan *of_dma_xilinx_xlate(struct of_phandle_args *dma_spec,
    static const struct xilinx_dma_config axidma_config = {
    .dmatype = XDMA_TYPE_AXIDMA,
    .clk_init = axidma_clk_init,
    + .irq_handler = xilinx_dma_irq_handler,
    };

    static const struct xilinx_dma_config axicdma_config = {
    .dmatype = XDMA_TYPE_CDMA,
    .clk_init = axicdma_clk_init,
    + .irq_handler = xilinx_dma_irq_handler,
    };

    static const struct xilinx_dma_config axivdma_config = {
    .dmatype = XDMA_TYPE_VDMA,
    .clk_init = axivdma_clk_init,
    + .irq_handler = xilinx_dma_irq_handler,
    };

    static const struct of_device_id xilinx_dma_of_ids[] = {
    --
    2.7.4
    \
     
     \ /
      Last update: 2019-10-22 19:02    [W:2.736 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site