diff options
| author | John Crispin <john@openwrt.org> | 2014-11-19 09:20:02 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-11-19 09:20:02 +0000 |
| commit | 989bfd815bf85568ced9c60ce8eef0d5939b0859 (patch) | |
| tree | f893b22d01f2845cbc46707d28e4224787921ec0 /target/linux/ramips | |
| parent | e1f6d0dd0ae64b242b73db4d3646d25a059b5ed2 (diff) | |
| download | upstream-989bfd815bf85568ced9c60ce8eef0d5939b0859.tar.gz upstream-989bfd815bf85568ced9c60ce8eef0d5939b0859.tar.bz2 upstream-989bfd815bf85568ced9c60ce8eef0d5939b0859.zip | |
ralink: make the dmaengine driver compile under 3.14
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 43304
Diffstat (limited to 'target/linux/ramips')
| -rw-r--r-- | target/linux/ramips/patches-3.14/0054-DMA-ralink-add-rt2880-dma-engine.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/target/linux/ramips/patches-3.14/0054-DMA-ralink-add-rt2880-dma-engine.patch b/target/linux/ramips/patches-3.14/0054-DMA-ralink-add-rt2880-dma-engine.patch index 39a3e5d6fd..817a75fd72 100644 --- a/target/linux/ramips/patches-3.14/0054-DMA-ralink-add-rt2880-dma-engine.patch +++ b/target/linux/ramips/patches-3.14/0054-DMA-ralink-add-rt2880-dma-engine.patch @@ -35,41 +35,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org> obj-$(CONFIG_K3_DMA) += k3dma.o obj-$(CONFIG_MOXART_DMA) += moxart-dma.o +obj-$(CONFIG_DMA_RALINK) += ralink-gdma.o ---- a/drivers/dma/dmaengine.c -+++ b/drivers/dma/dmaengine.c -@@ -564,6 +564,32 @@ struct dma_chan *dma_get_any_slave_chann - EXPORT_SYMBOL_GPL(dma_get_any_slave_channel); - - /** -+ * dma_request_slave_channel - try to get specific channel exclusively -+ * @chan: target channel -+ */ -+struct dma_chan *dma_get_slave_channel(struct dma_chan *chan) -+{ -+ int err = -EBUSY; -+ -+ /* lock against __dma_request_channel */ -+ mutex_lock(&dma_list_mutex); -+ -+ if (chan->client_count == 0) { -+ err = dma_chan_get(chan); -+ if (err) -+ pr_debug("%s: failed to get %s: (%d)\n", -+ __func__, dma_chan_name(chan), err); -+ } else -+ chan = NULL; -+ -+ mutex_unlock(&dma_list_mutex); -+ -+ return chan; -+} -+EXPORT_SYMBOL_GPL(dma_get_slave_channel); -+ -+ -+/** - * __dma_request_channel - try to allocate an exclusive channel - * @mask: capabilities that the channel must satisfy - * @fn: optional callback to disposition available channels --- /dev/null +++ b/drivers/dma/ralink-gdma.c @@ -0,0 +1,577 @@ |