Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08d62f58 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dmaengine: dw: register IRQ and DMA pool with instance ID 



It is really useful not only for debugging to have an IRQ line and DMA
pool labeled with driver and its instance ID. Do this for DesignWare DMA
driver.

All current users of this IP would be enhanced later on.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent a46a7634

drivers/dma/dw/core.c

+5 −2
Original line number Diff line number Diff line
@@ -1502,8 +1502,11 @@ int dw_dma_probe(struct dw_dma_chip *chip) 
	/* Force dma off, just in case */

	dw_dma_off(dw);



	/* Device and instance ID for IRQ and DMA pool */

	snprintf(dw->name, sizeof(dw->name), "dw:dmac%d", chip->id);



	/* Create a pool of consistent memory blocks for hardware descriptors */

	dw->desc_pool = dmam_pool_create("dw_dmac_desc_pool", chip->dev,

	dw->desc_pool = dmam_pool_create(dw->name, chip->dev,

					 sizeof(struct dw_desc), 4, 0);

	if (!dw->desc_pool) {

		dev_err(chip->dev, "No memory for descriptors dma pool\n");
@@ -1514,7 +1517,7 @@ int dw_dma_probe(struct dw_dma_chip *chip) 
	tasklet_init(&dw->tasklet, dw_dma_tasklet, (unsigned long)dw);



	err = request_irq(chip->irq, dw_dma_interrupt, IRQF_SHARED,

			  "dw_dmac", dw);

			  dw->name, dw);

	if (err)

		goto err_pdata;

drivers/dma/dw/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static int dw_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pid) 
		return -ENOMEM;



	chip->dev = &pdev->dev;

	chip->id = pdev->devfn;

	chip->regs = pcim_iomap_table(pdev)[0];

	chip->irq = pdev->irq;

	chip->pdata = pdata;

drivers/dma/dw/platform.c

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ static int dw_probe(struct platform_device *pdev) 
		pdata = dw_dma_parse_dt(pdev);



	chip->dev = dev;

	chip->id = pdev->id;

	chip->pdata = pdata;



	chip->clk = devm_clk_get(chip->dev, "hclk");

drivers/dma/dw/regs.h

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ static inline struct dw_dma_chan *to_dw_dma_chan(struct dma_chan *chan) 


struct dw_dma {

	struct dma_device	dma;

	char			name[20];

	void __iomem		*regs;

	struct dma_pool		*desc_pool;

	struct tasklet_struct	tasklet;

include/linux/dma/dw.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct dw_dma; 
/**

 * struct dw_dma_chip - representation of DesignWare DMA controller hardware

 * @dev:		struct device of the DMA controller

 * @id:			instance ID

 * @irq:		irq line

 * @regs:		memory mapped I/O space

 * @clk:		hclk clock
@@ -31,6 +32,7 @@ struct dw_dma; 
 */

struct dw_dma_chip {

	struct device	*dev;

	int		id;

	int		irq;

	void __iomem	*regs;

	struct clk	*clk;