Linus Torvalds ef08e78268
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ...
Pull slave-dmaengine update from Vinod Koul:
"This includes the cookie cleanup by Russell, the addition of context
parameter for dmaengine APIs, more arm dmaengine driver cleanup by
moving code to dmaengine, this time for imx by Javier and pl330 by
Boojin along with the usual driver fixes."
Fix up some fairly trivial conflicts with various other cleanups.
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)
dmaengine: imx: fix the build failure on x86_64
dmaengine: i.MX: Fix merge of cookie branch.
dmaengine: i.MX: Add support for interleaved transfers.
dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.
dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'.
dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
dmaengine: imx-dma: remove internal structure.
dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure.
dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.
dmaengine: imx-dma: remove sg member from internal structure.
dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function.
dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function.
dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function.
dmaengine: imx-dma: remove dma_mode member of internal structure.
dmaengine: imx-dma: remove data member from internal structure.
dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
dmaengine: at_hdmac: add slave config operation
dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic
dmaengine/dma_slave: introduce inline wrappers
dma: imx-sdma: Treat firmware messages as warnings instead of erros
...
2012-03-29 15:34:57 -07:00
2012-03-29 15:34:57 -07:00
2012-03-06 15:16:18 -05:00
2010-08-14 22:26:51 +02:00
2012-02-03 01:21:25 +01:00
2012-03-28 10:01:29 -07:00
2012-03-28 13:56:35 -07:00
2012-03-17 12:20:44 -07:00
2012-02-15 00:19:48 -05:00
2012-03-28 20:59:45 -07:00
2012-03-24 10:41:37 -07:00
2012-03-28 20:59:45 -07:00
2012-03-28 15:58:21 -07:00
2012-03-07 17:41:28 +01:00
2012-02-21 13:29:06 +01:00
2012-03-07 17:40:56 +01:00
2012-03-07 17:40:49 +01:00
2012-03-26 11:49:47 -04:00
2012-03-12 22:49:02 +01:00
2012-03-28 12:34:33 -07:00
2012-03-13 11:21:23 +11:00
2012-03-28 13:56:35 -07:00
2012-03-28 12:34:33 -07:00
2012-03-24 10:08:39 -07:00
2012-03-26 11:48:54 -04:00
2012-03-15 12:42:07 -07:00
2012-03-16 10:38:24 -04:00
2012-03-20 12:14:25 -04:00
2012-02-09 09:04:23 -08:00
2012-03-01 16:14:48 +01:00
2012-03-22 09:31:55 -04:00
2012-03-24 10:41:37 -07:00
2012-03-01 13:38:49 +01:00
2012-03-07 17:06:08 +11:00
2012-03-16 10:38:24 -04:00
2012-03-20 21:29:40 -04:00
2012-03-20 21:29:46 -04:00
2012-03-24 10:08:39 -07:00
2012-03-04 17:54:34 -05:00
2012-03-23 16:58:34 -07:00
2012-02-07 07:51:30 +01:00
2011-07-26 16:49:47 -07:00
2012-03-04 17:54:35 -05:00
2012-03-16 10:38:24 -04:00
2011-01-13 08:03:17 -08:00
2012-03-24 10:41:37 -07:00
2012-03-21 17:55:01 -07:00
2012-03-16 20:35:02 +00:00
2012-03-16 20:35:02 +00:00
2012-03-16 20:35:01 +00:00
2012-02-01 18:37:39 -08:00
2012-03-28 18:30:03 +01:00
2012-03-21 17:54:56 -07:00
2012-03-15 13:13:38 -04:00
2012-03-23 16:58:36 -07:00
2012-02-28 16:02:54 +01:00
2012-02-02 15:30:47 -08:00
2010-08-10 13:47:42 -07:00
2008-06-04 14:56:12 +01:00
2012-03-24 10:41:37 -07:00
2012-03-24 10:41:37 -07:00
2012-03-28 17:14:35 -07:00
2012-03-29 14:46:05 -07:00
2012-03-16 10:38:24 -04:00
2012-03-23 16:58:38 -07:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:37 -04:00
2012-03-03 09:02:52 -07:00
2012-03-28 15:58:21 -07:00
2012-03-20 21:29:53 -04:00
2011-11-23 18:49:22 +01:00
2012-03-17 21:51:34 +01:00
2012-03-21 18:55:10 -07:00
2012-02-20 19:46:36 +11:00
2012-03-28 15:02:41 -07:00
2012-03-29 15:34:57 -07:00
2012-02-22 18:15:39 +05:30
2012-01-24 12:48:54 -08:00
2011-11-29 12:46:19 -05:00
2012-03-28 14:24:40 -07:00
2012-03-28 18:30:03 +01:00
2012-02-08 09:19:42 +01:00
2012-03-04 17:54:34 -05:00
2012-03-08 11:53:13 -08:00
2011-12-11 18:25:16 -05:00
2012-02-13 00:46:41 -05:00
2012-03-01 16:41:26 -05:00
2012-03-04 17:54:34 -05:00
2012-03-24 10:41:37 -07:00
2012-03-20 21:29:32 -04:00
2012-03-18 22:15:39 +01:00
2012-03-24 10:41:37 -07:00
2011-05-26 17:12:33 -07:00
2012-01-29 20:35:52 +01:00
2009-12-17 10:58:17 -05:00
2012-03-29 14:53:25 -07:00
2012-03-04 17:54:34 -05:00
2012-02-21 11:08:29 -05:00
2012-02-21 11:08:30 -05:00
2012-03-02 10:38:33 +01:00
2012-02-28 17:10:21 +00:00
2012-02-01 09:13:11 -08:00
2012-03-28 14:08:46 -07:00
2012-03-24 10:08:39 -07:00
2012-03-21 17:55:02 -07:00
2012-03-21 17:54:59 -07:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-16 13:36:04 -07:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-04 17:54:34 -05:00
2012-03-28 15:58:21 -07:00
2012-02-21 16:56:45 -05:00
2012-03-04 20:41:38 -05:00
2012-03-24 10:08:39 -07:00
2012-02-24 01:37:35 -08:00
2012-02-08 15:52:45 -05:00
2012-02-08 15:52:45 -05:00
2012-03-16 23:00:20 -07:00
2012-03-21 17:54:59 -07:00
2011-01-31 21:17:41 -08:00
2012-03-09 10:56:35 -08:00
2012-03-28 18:30:03 +01:00
2012-03-04 17:54:34 -05:00
2012-02-15 09:45:53 +01:00
2012-02-14 08:44:55 -08:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-02-13 00:46:41 -05:00
2012-02-26 16:48:06 -07:00
2012-03-04 20:41:38 -05:00
2012-02-14 13:45:56 -02:00
2012-03-13 22:45:38 -04:00
2012-03-13 22:45:25 -04:00
2012-02-28 20:01:08 +01:00
2012-03-16 10:38:24 -04:00
2012-03-08 10:50:35 -08:00
2012-03-04 20:41:38 -05:00
2012-03-21 17:54:57 -07:00
2012-03-24 10:08:39 -07:00
2012-03-23 08:53:47 -07:00
2012-03-08 10:50:35 -08:00
2012-03-23 16:58:41 -07:00
2012-03-05 15:49:42 -08:00
2012-03-04 17:54:34 -05:00
2012-03-28 14:35:31 -07:00
2012-03-08 14:11:36 +02:00
2012-03-23 16:58:35 -07:00
2012-03-23 16:58:34 -07:00
2012-02-29 15:35:41 -06:00
2012-03-28 18:30:03 +01:00
2011-11-04 17:22:14 -07:00
2012-03-23 16:58:33 -07:00
2012-02-02 15:43:40 -08:00
2012-03-28 18:30:03 +01:00
2012-03-23 16:58:31 -07:00
2012-03-16 10:38:24 -04:00
2012-03-15 21:41:34 +01:00
2011-01-10 19:04:08 +01:00
2012-03-03 15:04:45 -05:00
2012-03-21 17:55:02 -07:00
2012-03-04 17:54:34 -05:00
2012-03-21 17:54:57 -07:00
2012-03-28 17:19:28 -07:00
2012-03-21 17:54:56 -07:00
2012-03-27 16:30:09 -07:00
2012-03-26 12:50:52 +10:30
2011-07-24 22:06:04 +09:30
2012-03-26 12:50:51 +10:30
2012-02-02 00:23:14 +11:00
2006-11-30 04:40:22 +01:00
2008-06-06 11:29:12 -07:00
2012-02-21 15:03:48 -05:00
2012-02-24 01:42:07 -08:00
2012-03-24 10:41:37 -07:00
2012-02-24 10:05:59 +01:00
2012-02-26 14:10:44 -05:00
2012-03-06 15:16:19 -05:00
2012-03-26 11:48:54 -04:00
2012-01-31 18:20:28 -05:00
2012-03-02 17:18:10 -05:00
2012-03-21 09:31:44 -04:00
2012-03-05 15:26:47 -05:00
2012-02-16 14:55:27 -05:00
2012-03-17 11:09:33 -04:00
2012-03-21 09:31:46 -04:00
2012-01-31 18:20:25 -05:00
2012-03-04 17:54:34 -05:00
2012-03-12 14:19:34 -04:00
2012-03-23 16:58:31 -07:00
2011-12-21 14:48:43 -08:00
2012-02-16 06:11:23 -07:00
2012-03-24 10:41:37 -07:00
2012-02-05 23:08:30 -07:00
2012-02-26 16:48:06 -07:00
2012-03-15 23:28:19 +08:00
2012-03-05 08:09:09 -07:00
2012-03-28 14:41:36 -07:00
2012-02-23 09:39:23 +02:00
2012-03-21 17:54:58 -07:00
2012-03-16 10:38:24 -04:00
2012-03-14 17:25:56 +08:00
2012-03-21 17:55:01 -07:00
2012-03-24 10:08:39 -07:00
2012-03-28 18:30:03 +01:00
2008-10-13 10:10:37 -07:00
2011-12-13 15:07:49 +00:00
2012-03-04 20:54:01 -05:00
2012-02-23 12:05:21 -08:00
2012-03-23 14:02:12 -07:00
2012-03-04 09:34:15 -08:00
2012-03-09 08:26:05 +01:00
2012-03-16 10:38:24 -04:00
2012-03-28 17:14:36 -07:00
2012-03-23 16:58:31 -07:00
2012-02-07 12:54:56 -05:00
2012-03-24 10:41:37 -07:00
2012-03-13 22:37:14 +01:00
2012-03-04 23:08:46 +01:00
2012-03-16 21:49:24 +01:00
2012-03-23 16:58:38 -07:00
2012-03-04 17:54:34 -05:00
2012-03-16 10:38:24 -04:00
2006-10-03 23:01:26 +02:00
2012-03-04 20:41:38 -05:00
2012-03-04 20:41:38 -05:00
2012-03-04 20:41:38 -05:00
2011-01-13 08:03:21 -08:00
2012-03-23 16:58:32 -07:00
2012-03-01 10:28:04 +01:00
2012-03-20 11:16:20 -07:00
2012-02-01 16:53:46 +08:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:38 -04:00
2012-03-28 17:14:37 -07:00
2012-03-24 10:08:39 -07:00
2012-02-21 09:03:41 -08:00
2012-02-21 09:06:08 -08:00
2012-03-24 10:41:37 -07:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:43 -04:00
2012-03-20 21:29:42 -04:00
2012-03-04 17:54:34 -05:00
2012-03-06 19:14:37 +02:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-21 17:54:57 -07:00
2006-07-13 13:21:35 -07:00
2012-02-08 22:53:58 +02:00
2012-03-15 18:23:10 -07:00
2012-02-21 16:56:45 -05:00
2012-03-28 18:30:03 +01:00
2012-03-07 11:32:21 +00:00
2012-03-04 17:54:34 -05:00
2012-03-28 15:58:21 -07:00
2009-10-30 08:27:25 +11:00
2012-03-21 13:25:04 -07:00
2012-03-24 10:08:39 -07:00
2012-03-09 12:47:56 -08:00
2012-03-16 10:38:24 -04:00
2012-03-08 11:38:50 -08:00
2012-03-12 22:19:13 +01:00
2012-02-01 22:23:53 +05:30
2012-02-16 17:08:09 -05:00
2012-02-24 11:42:50 -08:00
2012-03-28 15:58:21 -07:00
2012-03-06 11:01:33 +02:00
2012-03-28 15:04:26 -07:00
2012-03-28 17:14:35 -07:00
2012-03-19 16:53:08 -04:00
2012-03-11 19:11:22 -07:00
2012-03-23 13:18:57 +01:00
2012-03-28 15:58:21 -07:00
2012-02-21 09:06:09 -08:00
2008-05-26 16:15:32 +02:00
2011-06-14 22:48:51 -04:00
2006-12-07 02:14:08 +01:00
2012-02-24 10:05:59 +01:00
2012-03-28 18:30:03 +01:00
2011-10-31 17:30:47 -07:00
2009-04-10 15:48:52 +02:00
2012-02-10 10:44:35 -08:00
2012-02-17 23:36:23 +01:00
2012-03-28 17:14:35 -07:00
2012-03-04 17:54:34 -05:00
2012-02-10 11:42:25 -08:00
2012-03-04 17:54:34 -05:00
2012-03-01 17:57:40 -05:00
2012-03-23 16:25:20 -07:00
2010-10-22 14:46:25 +02:00
2011-05-23 13:59:53 +02:00
2011-04-26 14:01:42 -07:00
2012-03-22 19:43:43 -07:00
2012-03-20 21:29:40 -04:00
2012-03-23 16:58:40 -07:00
2012-02-24 10:05:59 +01:00
2012-03-04 17:54:34 -05:00
2012-03-08 11:38:51 -08:00
2012-03-28 18:30:03 +01:00
2012-03-13 14:24:07 -07:00
2012-03-19 15:33:24 -03:00
2012-03-04 17:54:34 -05:00
2012-03-27 16:30:09 -07:00
2012-02-19 09:50:20 -06:00
2011-12-05 23:27:59 +00:00
2012-03-08 10:50:35 -08:00
2012-03-28 18:30:03 +01:00
2012-03-27 20:15:37 +02:00
2012-03-02 10:51:00 +01:00
2012-03-07 16:08:46 +01:00
ef08e78268