Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits) dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle dmaengine/ep93xx_dma: add module.h include pch_dma: Reduce wasting memory pch_dma: Fix suspend issue dma/timberdale: free_irq() on an error path dma: shdma: transfer based runtime PM dmaengine: shdma: protect against the IRQ handler dmaengine i.MX DMA/SDMA: add missing include of linux/module.h dmaengine: delete redundant chan_id and chancnt initialization in dma drivers dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers serial: sh-sci: don't filter on DMA device, use only channel ID ARM: SAMSUNG: Remove Samsung specific enum type for dma direction ASoC: Samsung: Update DMA interface spi/s3c64xx: Merge dma control code spi/s3c64xx: Add support DMA engine API ARM: SAMSUNG: Remove S3C-PL330-DMA driver ARM: S5P64X0: Use generic DMA PL330 driver ARM: S5PC100: Use generic DMA PL330 driver ARM: S5PV210: Use generic DMA PL330 driver ... Fix up fairly trivial conflicts in - arch/arm/mach-exynos4/{Kconfig,clock.c} - arch/arm/mach-s5p64x0/dma.c

Linus Torvalds committed 15 years ago

Commit fba95692 parents 3d0a8d1 4598fc260 files · +2304 −2447Browse files

Showing the changes to include/linux (4 of 60 files). Show all

Unified · Split

4 files

include/linux/amba/pl08x.h +25 −5
include/linux/amba/pl330.h +1 −5
include/linux/dmaengine.h +11 −2
include/linux/serial_sci.h +0 −2

include/linux/amba/pl08x.h+25−5

@@ -47,6 +47,9 @@ enum { · 46 unmodified lines
47	47	* @muxval: a number usually used to poke into some mux regiser to
48	48	* mux in the signal to this channel
49	49	* @cctl_opt: default options for the channel control register
	50	+ * @device_fc: Flow Controller Settings for ccfg register. Only valid for slave
	51	+ * channels. Fill with 'true' if peripheral should be flow controller. Direction
	52	+ * will be selected at Runtime.
50	53	* @addr: source/target address in physical memory for this DMA channel,
51	54	* can be the address of a FIFO register for burst requests for example.
52	55	* This can be left undefined if the PrimeCell API is used for configuring
@@ -65,6 +68,7 @@ struct pl08x_channel_data { · 12 unmodified lines
65	68	int max_signal;
66	69	u32 muxval;
67	70	u32 cctl;
	71	+ bool device_fc;
68	72	dma_addr_t addr;
69	73	bool circular_buffer;
70	74	bool single;
@@ -77,13 +81,11 @@ struct pl08x_channel_data { · 6 unmodified lines
77	81	* @addr: current address
78	82	* @maxwidth: the maximum width of a transfer on this bus
79	83	* @buswidth: the width of this bus in bytes: 1, 2 or 4
80		− * @fill_bytes: bytes required to fill to the next bus memory boundary
81	84	*/
82	85	struct pl08x_bus_data {
83	86	dma_addr_t addr;
84	87	u8 maxwidth;
85	88	u8 buswidth;
86		− size_t fill_bytes;
87	89	};
88	90
89	91	/**
@@ -103,18 +105,36 @@ struct pl08x_phy_chan { · 13 unmodified lines
103	105	struct pl08x_dma_chan *serving;
104	106	};
105	107
	108	+/**
	109	+ * struct pl08x_sg - structure containing data per sg
	110	+ * @src_addr: src address of sg
	111	+ * @dst_addr: dst address of sg
	112	+ * @len: transfer len in bytes
	113	+ * @node: node for txd's dsg_list
	114	+ */
	115	+struct pl08x_sg {
	116	+ dma_addr_t src_addr;
	117	+ dma_addr_t dst_addr;
	118	+ size_t len;
	119	+ struct list_head node;
	120	+};
	121	+
106	122	/**
107	123	* struct pl08x_txd - wrapper for struct dma_async_tx_descriptor
	124	+ * @tx: async tx descriptor
	125	+ * @node: node for txd list for channels
	126	+ * @dsg_list: list of children sg's
	127	+ * @direction: direction of transfer
108	128	* @llis_bus: DMA memory address (physical) start for the LLIs
109	129	* @llis_va: virtual memory address start for the LLIs
	130	+ * @cctl: control reg values for current txd
	131	+ * @ccfg: config reg values for current txd
110	132	*/
111	133	struct pl08x_txd {
112	134	struct dma_async_tx_descriptor tx;
113	135	struct list_head node;
	136	+ struct list_head dsg_list;
114	137	enum dma_data_direction direction;
115		− dma_addr_t src_addr;
116		− dma_addr_t dst_addr;
117		− size_t len;
118	138	dma_addr_t llis_bus;
119	139	struct pl08x_lli *llis_va;
120	140	/* Default cctl value for LLIs */

include/linux/amba/pl330.h+1−5

@@ -19,12 +19,8 @@ struct dma_pl330_peri { · 18 unmodified lines
19	19	* Peri_Req i/f of the DMAC that is
20	20	* peripheral could be reached from.
21	21	*/
22		− u8 peri_id; /* {0, 31} */
	22	+ u8 peri_id; /* specific dma id */
23	23	enum pl330_reqtype rqtype;
24		−
25		− /* For M->D and D->M Channels */
26		− int burst_sz; /* in power of 2 */
27		− dma_addr_t fifo_addr;
28	24	};
29	25
30	26	struct dma_pl330_platdata {

include/linux/dmaengine.h+11−2

@@ -24,8 +24,7 @@ · 23 unmodified lines
24	24	#include <linux/device.h>
25	25	#include <linux/uio.h>
26	26	#include <linux/dma-direction.h>
27		−
28		−struct scatterlist;
	27	+#include <linux/scatterlist.h>
29	28
30	29	/**
31	30	* typedef dma_cookie_t - an opaque DMA cookie
@@ -519,6 +518,16 @@ static inline int dmaengine_slave_config(struct dma_chan *chan, · 487 unmodified lines
519	518	(unsigned long)config);
520	519	}
521	520
	521	+static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(
	522	+ struct dma_chan chan, void buf, size_t len,
	523	+ enum dma_data_direction dir, unsigned long flags)
	524	+{
	525	+ struct scatterlist sg;
	526	+ sg_init_one(&sg, buf, len);
	527	+
	528	+ return chan->device->device_prep_slave_sg(chan, &sg, 1, dir, flags);
	529	+}
	530	+
522	531	static inline int dmaengine_terminate_all(struct dma_chan *chan)
523	532	{
524	533	return dmaengine_device_control(chan, DMA_TERMINATE_ALL, 0);

include/linux/serial_sci.h+0−2

@@ -131,8 +131,6 @@ struct plat_sci_port { · 130 unmodified lines
131	131
132	132	struct plat_sci_port_ops *ops;
133	133
134		− struct device *dma_dev;
135		−
136	134	unsigned int dma_slave_tx;
137	135	unsigned int dma_slave_rx;
138	136	};