aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@st.com>2012-02-01 05:42:19 -0500
committerVinod Koul <vinod.koul@linux.intel.com>2012-02-22 07:45:37 -0500
commit258aea76f552cc755da92e7e823abbb85e021514 (patch)
tree255afabb5d51cc8b9ff0138663ad884c249b6c70
parentdcc043dc0c60046cf6b75ca04a462314cf64e2ba (diff)
dmaengine: Pass dma_slave_config .device_fc = NULL for all existing users
.device_fc is added in struct dma_slave_config recently. All user drivers, which want DMA to be the flow controller must pass this field as false. As earlier driver don't look to use this feature, mark it false for now. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
-rw-r--r--drivers/mmc/host/mmci.c2
-rw-r--r--drivers/mmc/host/mxcmmc.c2
-rw-r--r--drivers/spi/spi-dw-mid.c3
-rw-r--r--drivers/spi/spi-pl022.c2
-rw-r--r--drivers/tty/serial/amba-pl011.c3
-rw-r--r--drivers/usb/musb/ux500_dma.c1
-rw-r--r--sound/soc/imx/imx-pcm-dma-mx2.c3
7 files changed, 16 insertions, 0 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 0d955ffaf44..a09c06ba046 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -30,6 +30,7 @@
30#include <linux/dma-mapping.h> 30#include <linux/dma-mapping.h>
31#include <linux/amba/mmci.h> 31#include <linux/amba/mmci.h>
32#include <linux/pm_runtime.h> 32#include <linux/pm_runtime.h>
33#include <linux/types.h>
33 34
34#include <asm/div64.h> 35#include <asm/div64.h>
35#include <asm/io.h> 36#include <asm/io.h>
@@ -370,6 +371,7 @@ static int mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,
370 .dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, 371 .dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,
371 .src_maxburst = variant->fifohalfsize >> 2, /* # of words */ 372 .src_maxburst = variant->fifohalfsize >> 2, /* # of words */
372 .dst_maxburst = variant->fifohalfsize >> 2, /* # of words */ 373 .dst_maxburst = variant->fifohalfsize >> 2, /* # of words */
374 .device_fc = false,
373 }; 375 };
374 struct dma_chan *chan; 376 struct dma_chan *chan;
375 struct dma_device *device; 377 struct dma_device *device;
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index f35b6bad047..68b69a91e5e 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -33,6 +33,7 @@
33#include <linux/gpio.h> 33#include <linux/gpio.h>
34#include <linux/regulator/consumer.h> 34#include <linux/regulator/consumer.h>
35#include <linux/dmaengine.h> 35#include <linux/dmaengine.h>
36#include <linux/types.h>
36 37
37#include <asm/dma.h> 38#include <asm/dma.h>
38#include <asm/irq.h> 39#include <asm/irq.h>
@@ -711,6 +712,7 @@ static int mxcmci_setup_dma(struct mmc_host *mmc)
711 config->src_addr_width = 4; 712 config->src_addr_width = 4;
712 config->dst_maxburst = host->burstlen; 713 config->dst_maxburst = host->burstlen;
713 config->src_maxburst = host->burstlen; 714 config->src_maxburst = host->burstlen;
715 config->device_fc = false;
714 716
715 return dmaengine_slave_config(host->dma, config); 717 return dmaengine_slave_config(host->dma, config);
716} 718}
diff --git a/drivers/spi/spi-dw-mid.c b/drivers/spi/spi-dw-mid.c
index 8418eb03665..04d6c1b3138 100644
--- a/drivers/spi/spi-dw-mid.c
+++ b/drivers/spi/spi-dw-mid.c
@@ -22,6 +22,7 @@
22#include <linux/interrupt.h> 22#include <linux/interrupt.h>
23#include <linux/slab.h> 23#include <linux/slab.h>
24#include <linux/spi/spi.h> 24#include <linux/spi/spi.h>
25#include <linux/types.h>
25 26
26#include "spi-dw.h" 27#include "spi-dw.h"
27 28
@@ -136,6 +137,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
136 txconf.dst_maxburst = LNW_DMA_MSIZE_16; 137 txconf.dst_maxburst = LNW_DMA_MSIZE_16;
137 txconf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; 138 txconf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
138 txconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; 139 txconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
140 txconf.device_fc = false;
139 141
140 txchan->device->device_control(txchan, DMA_SLAVE_CONFIG, 142 txchan->device->device_control(txchan, DMA_SLAVE_CONFIG,
141 (unsigned long) &txconf); 143 (unsigned long) &txconf);
@@ -158,6 +160,7 @@ static int mid_spi_dma_transfer(struct dw_spi *dws, int cs_change)
158 rxconf.src_maxburst = LNW_DMA_MSIZE_16; 160 rxconf.src_maxburst = LNW_DMA_MSIZE_16;
159 rxconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; 161 rxconf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
160 rxconf.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; 162 rxconf.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
163 rxconf.device_fc = false;
161 164
162 rxchan->device->device_control(rxchan, DMA_SLAVE_CONFIG, 165 rxchan->device->device_control(rxchan, DMA_SLAVE_CONFIG,
163 (unsigned long) &rxconf); 166 (unsigned long) &rxconf);
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 2f9cb43a239..1dc667f8a30 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -901,10 +901,12 @@ static int configure_dma(struct pl022 *pl022)
901 struct dma_slave_config rx_conf = { 901 struct dma_slave_config rx_conf = {
902 .src_addr = SSP_DR(pl022->phybase), 902 .src_addr = SSP_DR(pl022->phybase),
903 .direction = DMA_DEV_TO_MEM, 903 .direction = DMA_DEV_TO_MEM,
904 .device_fc = false,
904 }; 905 };
905 struct dma_slave_config tx_conf = { 906 struct dma_slave_config tx_conf = {
906 .dst_addr = SSP_DR(pl022->phybase), 907 .dst_addr = SSP_DR(pl022->phybase),
907 .direction = DMA_MEM_TO_DEV, 908 .direction = DMA_MEM_TO_DEV,
909 .device_fc = false,
908 }; 910 };
909 unsigned int pages; 911 unsigned int pages;
910 int ret; 912 int ret;
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 9ae024025ff..db7f88a1bde 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -51,6 +51,7 @@
51#include <linux/dma-mapping.h> 51#include <linux/dma-mapping.h>
52#include <linux/scatterlist.h> 52#include <linux/scatterlist.h>
53#include <linux/delay.h> 53#include <linux/delay.h>
54#include <linux/types.h>
54 55
55#include <asm/io.h> 56#include <asm/io.h>
56#include <asm/sizes.h> 57#include <asm/sizes.h>
@@ -270,6 +271,7 @@ static void pl011_dma_probe_initcall(struct uart_amba_port *uap)
270 .dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE, 271 .dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
271 .direction = DMA_MEM_TO_DEV, 272 .direction = DMA_MEM_TO_DEV,
272 .dst_maxburst = uap->fifosize >> 1, 273 .dst_maxburst = uap->fifosize >> 1,
274 .device_fc = false,
273 }; 275 };
274 struct dma_chan *chan; 276 struct dma_chan *chan;
275 dma_cap_mask_t mask; 277 dma_cap_mask_t mask;
@@ -303,6 +305,7 @@ static void pl011_dma_probe_initcall(struct uart_amba_port *uap)
303 .src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE, 305 .src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE,
304 .direction = DMA_DEV_TO_MEM, 306 .direction = DMA_DEV_TO_MEM,
305 .src_maxburst = uap->fifosize >> 1, 307 .src_maxburst = uap->fifosize >> 1,
308 .device_fc = false,
306 }; 309 };
307 310
308 chan = dma_request_channel(mask, plat->dma_filter, plat->dma_rx_param); 311 chan = dma_request_channel(mask, plat->dma_filter, plat->dma_rx_param);
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index 97cb45916c4..2a36bf37d7a 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -115,6 +115,7 @@ static bool ux500_configure_channel(struct dma_channel *channel,
115 slave_conf.dst_addr = usb_fifo_addr; 115 slave_conf.dst_addr = usb_fifo_addr;
116 slave_conf.dst_addr_width = addr_width; 116 slave_conf.dst_addr_width = addr_width;
117 slave_conf.dst_maxburst = 16; 117 slave_conf.dst_maxburst = 16;
118 slave_conf.device_fc = false;
118 119
119 dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG, 120 dma_chan->device->device_control(dma_chan, DMA_SLAVE_CONFIG,
120 (unsigned long) &slave_conf); 121 (unsigned long) &slave_conf);
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c
index 1acfd25e107..52b0dedbf99 100644
--- a/sound/soc/imx/imx-pcm-dma-mx2.c
+++ b/sound/soc/imx/imx-pcm-dma-mx2.c
@@ -21,6 +21,7 @@
21#include <linux/platform_device.h> 21#include <linux/platform_device.h>
22#include <linux/slab.h> 22#include <linux/slab.h>
23#include <linux/dmaengine.h> 23#include <linux/dmaengine.h>
24#include <linux/types.h>
24 25
25#include <sound/core.h> 26#include <sound/core.h>
26#include <sound/initval.h> 27#include <sound/initval.h>
@@ -108,6 +109,8 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream,
108 return 0; 109 return 0;
109 } 110 }
110 111
112 slave_config.device_fc = false;
113
111 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { 114 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
112 slave_config.direction = DMA_MEM_TO_DEV; 115 slave_config.direction = DMA_MEM_TO_DEV;
113 slave_config.dst_addr = dma_params->dma_addr; 116 slave_config.dst_addr = dma_params->dma_addr;