Merge branch 'dma_slave_direction' into next_test_dirn (e0d23ef2) · Commits · e / devices / android_kernel_teracube_emerald

arch/arm/mach-ep93xx/include/mach/dma.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@
		*/
		struct ep93xx_dma_data {
		int port;
		enum dma_data_direction direction;
		enum dma_transfer_direction direction;
		const char *name;
		};

		@@ -80,14 +80,14 @@ static inline bool ep93xx_dma_chan_is_m2p(struct dma_chan *chan)
		* channel supports given DMA direction. Only M2P channels have such
		* limitation, for M2M channels the direction is configurable.
		*/
		static inline enum dma_data_direction
		static inline enum dma_transfer_direction
		ep93xx_dma_chan_direction(struct dma_chan *chan)
		{
		if (!ep93xx_dma_chan_is_m2p(chan))
		return DMA_NONE;

		/* even channels are for TX, odd for RX */
		return (chan->chan_id % 2 == 0) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
		return (chan->chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
		}

		#endif /* __ASM_ARCH_DMA_H */

arch/arm/plat-nomadik/include/plat/ste_dma40.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ static inline struct
		dma_async_tx_descriptor stedma40_slave_mem(struct dma_chan chan,
		dma_addr_t addr,
		unsigned int size,
		enum dma_data_direction direction,
		enum dma_transfer_direction direction,
		unsigned long flags)
		{
		struct scatterlist sg;
		@@ -209,7 +209,7 @@ static inline struct
		dma_async_tx_descriptor stedma40_slave_mem(struct dma_chan chan,
		dma_addr_t addr,
		unsigned int size,
		enum dma_data_direction direction,
		enum dma_transfer_direction direction,
		unsigned long flags)
		{
		return NULL;

arch/arm/plat-samsung/dma-ops.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,14 +36,14 @@ static unsigned samsung_dmadev_request(enum dma_ch dma_ch,

		chan = dma_request_channel(mask, pl330_filter, (void *)dma_ch);

		if (info->direction == DMA_FROM_DEVICE) {
		if (info->direction == DMA_DEV_TO_MEM) {
		memset(&slave_config, 0, sizeof(struct dma_slave_config));
		slave_config.direction = info->direction;
		slave_config.src_addr = info->fifo;
		slave_config.src_addr_width = info->width;
		slave_config.src_maxburst = 1;
		dmaengine_slave_config(chan, &slave_config);
		} else if (info->direction == DMA_TO_DEVICE) {
		} else if (info->direction == DMA_MEM_TO_DEV) {
		memset(&slave_config, 0, sizeof(struct dma_slave_config));
		slave_config.direction = info->direction;
		slave_config.dst_addr = info->fifo;

arch/arm/plat-samsung/include/plat/dma-ops.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@

		struct samsung_dma_prep_info {
		enum dma_transaction_type cap;
		enum dma_data_direction direction;
		enum dma_transfer_direction direction;
		dma_addr_t buf;
		unsigned long period;
		unsigned long len;
		@@ -27,7 +27,7 @@ struct samsung_dma_prep_info {

		struct samsung_dma_info {
		enum dma_transaction_type cap;
		enum dma_data_direction direction;
		enum dma_transfer_direction direction;
		enum dma_slave_buswidth width;
		dma_addr_t fifo;
		struct s3c2410_dma_client *client;

drivers/dma/amba-pl08x.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -882,9 +882,9 @@ static int prep_phy_channel(struct pl08x_dma_chan *plchan,
		ch->signal = ret;

		/* Assign the flow control signal to this channel */
		if (txd->direction == DMA_TO_DEVICE)
		if (txd->direction == DMA_MEM_TO_DEV)
		txd->ccfg \|= ch->signal << PL080_CONFIG_DST_SEL_SHIFT;
		else if (txd->direction == DMA_FROM_DEVICE)
		else if (txd->direction == DMA_DEV_TO_MEM)
		txd->ccfg \|= ch->signal << PL080_CONFIG_SRC_SEL_SHIFT;
		}

		@@ -1102,10 +1102,10 @@ static int dma_set_runtime_config(struct dma_chan *chan,

		/* Transfer direction */
		plchan->runtime_direction = config->direction;
		if (config->direction == DMA_TO_DEVICE) {
		if (config->direction == DMA_MEM_TO_DEV) {
		addr_width = config->dst_addr_width;
		maxburst = config->dst_maxburst;
		} else if (config->direction == DMA_FROM_DEVICE) {
		} else if (config->direction == DMA_DEV_TO_MEM) {
		addr_width = config->src_addr_width;
		maxburst = config->src_maxburst;
		} else {
		@@ -1136,7 +1136,7 @@ static int dma_set_runtime_config(struct dma_chan *chan,
		cctl \|= burst << PL080_CONTROL_SB_SIZE_SHIFT;
		cctl \|= burst << PL080_CONTROL_DB_SIZE_SHIFT;

		if (plchan->runtime_direction == DMA_FROM_DEVICE) {
		if (plchan->runtime_direction == DMA_DEV_TO_MEM) {
		plchan->src_addr = config->src_addr;
		plchan->src_cctl = pl08x_cctl(cctl) \| PL080_CONTROL_DST_INCR \|
		pl08x_select_bus(plchan->cd->periph_buses,
		@@ -1152,7 +1152,7 @@ static int dma_set_runtime_config(struct dma_chan *chan,
		"configured channel %s (%s) for %s, data width %d, "
		"maxburst %d words, LE, CCTL=0x%08x\n",
		dma_chan_name(chan), plchan->name,
		(config->direction == DMA_FROM_DEVICE) ? "RX" : "TX",
		(config->direction == DMA_DEV_TO_MEM) ? "RX" : "TX",
		addr_width,
		maxburst,
		cctl);
		@@ -1322,7 +1322,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_dma_memcpy(

		static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
		struct dma_chan chan, struct scatterlist sgl,
		unsigned int sg_len, enum dma_data_direction direction,
		unsigned int sg_len, enum dma_transfer_direction direction,
		unsigned long flags)
		{
		struct pl08x_dma_chan *plchan = to_pl08x_chan(chan);
		@@ -1354,10 +1354,10 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
		*/
		txd->direction = direction;

		if (direction == DMA_TO_DEVICE) {
		if (direction == DMA_MEM_TO_DEV) {
		txd->cctl = plchan->dst_cctl;
		slave_addr = plchan->dst_addr;
		} else if (direction == DMA_FROM_DEVICE) {
		} else if (direction == DMA_DEV_TO_MEM) {
		txd->cctl = plchan->src_cctl;
		slave_addr = plchan->src_addr;
		} else {
		@@ -1368,10 +1368,10 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
		}

		if (plchan->cd->device_fc)
		tmp = (direction == DMA_TO_DEVICE) ? PL080_FLOW_MEM2PER_PER :
		tmp = (direction == DMA_MEM_TO_DEV) ? PL080_FLOW_MEM2PER_PER :
		PL080_FLOW_PER2MEM_PER;
		else
		tmp = (direction == DMA_TO_DEVICE) ? PL080_FLOW_MEM2PER :
		tmp = (direction == DMA_MEM_TO_DEV) ? PL080_FLOW_MEM2PER :
		PL080_FLOW_PER2MEM;

		txd->ccfg \|= tmp << PL080_CONFIG_FLOW_CONTROL_SHIFT;
		@@ -1387,7 +1387,7 @@ static struct dma_async_tx_descriptor *pl08x_prep_slave_sg(
		list_add_tail(&dsg->node, &txd->dsg_list);

		dsg->len = sg_dma_len(sg);
		if (direction == DMA_TO_DEVICE) {
		if (direction == DMA_MEM_TO_DEV) {
		dsg->src_addr = sg_phys(sg);
		dsg->dst_addr = slave_addr;
		} else {