Commit c2f6b67d authored by Radhey Shyam Pandey's avatar Radhey Shyam Pandey Committed by Vinod Koul
Browse files

dmaengine: xilinx_dma: Extend dma_config struct to store irq routine handle 



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: default avatarRadhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Suggested-by: default avatarVinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/1571763622-29281-6-git-send-email-radhey.shyam.pandey@xilinx.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent bcb2dc7b

drivers/dma/xilinx/xilinx_dma.c

+6 −2
Original line number Diff line number Diff line
@@ -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[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE