Commit 13b3006b authored by Daniel Mack's avatar Daniel Mack Committed by Vinod Koul
Browse files

dma: mmp_pdma: add filter function 



PXA peripherals need to obtain specific DMA request ids which will
eventually be stored in the DRCMR register.

Currently, clients are expected to store that number inside the slave
config block as slave_id, which is unfortunately incompatible with the
way DMA resources are handled in DT environments.

This patch adds a filter function which stores the filter parameter
passed in by of-dma.c into the channel's drcmr register.

For backward compatability, cfg->slave_id is still used if set to
a non-zero value.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 1ac0e845

drivers/dma/mmp_pdma.c

+20 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/dmapool.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/dma/mmp-pdma.h>



#include "dmaengine.h"
@@ -635,8 +636,13 @@ static int mmp_pdma_control(struct dma_chan *dchan, enum dma_ctrl_cmd cmd, 
			chan->dcmd |= DCMD_BURST32;



		chan->dir = cfg->direction;

		chan->drcmr = cfg->slave_id;

		chan->dev_addr = addr;

		/* FIXME: drivers should be ported over to use the filter

		 * function. Once that's done, the following two lines can

		 * be removed.

		 */

		if (cfg->slave_id)

			chan->drcmr = cfg->slave_id;

		break;

	default:

		return -ENOSYS;
@@ -877,6 +883,19 @@ static struct platform_driver mmp_pdma_driver = { 
	.remove		= mmp_pdma_remove,

};



bool mmp_pdma_filter_fn(struct dma_chan *chan, void *param)

{

	struct mmp_pdma_chan *c = to_mmp_pdma_chan(chan);



	if (chan->device->dev->driver != &mmp_pdma_driver.driver)

		return false;



	c->drcmr = *(unsigned int *) param;



	return true;

}

EXPORT_SYMBOL_GPL(mmp_pdma_filter_fn);



module_platform_driver(mmp_pdma_driver);



MODULE_DESCRIPTION("MARVELL MMP Periphera DMA Driver");

include/linux/dma/mmp-pdma.h

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#ifndef _MMP_PDMA_H_

#define _MMP_PDMA_H_



struct dma_chan;



#ifdef CONFIG_MMP_PDMA

bool mmp_pdma_filter_fn(struct dma_chan *chan, void *param);

#else

static inline bool mmp_pdma_filter_fn(struct dma_chan *chan, void *param)

{

	return false;

}

#endif



#endif /* _MMP_PDMA_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE