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

Commit 864ef69b authored by Matt Porter's avatar Matt Porter Committed by Vinod Koul
Browse files

dmaengine: add dma_request_slave_channel_compat() 



Adds a dma_request_slave_channel_compat() wrapper which accepts
both the arguments from dma_request_channel() and
dma_request_slave_channel(). Based on whether the driver is
instantiated via DT, the appropriate channel request call will be
made.

This allows for a much cleaner migration of drivers to the
dmaengine DT API as platforms continue to be mixed between those
that boot using DT and those that do not.

Suggested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMatt Porter <mporter@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 17166a3b

include/linux/dmaengine.h

+16 −0
Original line number Original line Diff line number Diff line
@@ -1001,6 +1001,22 @@ void dma_run_dependencies(struct dma_async_tx_descriptor *tx); 
struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);

struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);

struct dma_chan *net_dma_find_channel(void);

struct dma_chan *net_dma_find_channel(void);

#define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)

#define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)

#define dma_request_slave_channel_compat(mask, x, y, dev, name) \

	__dma_request_slave_channel_compat(&(mask), x, y, dev, name)



static inline struct dma_chan

*__dma_request_slave_channel_compat(dma_cap_mask_t *mask, dma_filter_fn fn,

				  void *fn_param, struct device *dev,

				  char *name)

{

	struct dma_chan *chan;



	chan = dma_request_slave_channel(dev, name);

	if (chan)

		return chan;



	return __dma_request_channel(mask, fn, fn_param);

}





/* --- Helper iov-locking functions --- */

/* --- Helper iov-locking functions --- */