linux-next: manual merge of the arm-soc tree with the slave-dmatree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/dma/imx-sdma.c between commit 2ccaef0520d1 ("dma: imx-sdma: make
channel0 operations atomic") from the slave-dma tree and commit
7560e3f3581e ("dmaengine i.MX SDMA: do not depend on grouped clocks")
from the arm-soc tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/dma/imx-sdma.c
index a472a29,fddccae..0000000
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@@ -323,8 -322,9 +323,9 @@@ struct sdma_engine 
  	struct sdma_context_data	*context;
  	dma_addr_t			context_phys;
  	struct dma_device		dma_device;
- 	struct clk			*clk;
+ 	struct clk			*clk_ipg;
+ 	struct clk			*clk_ahb;
 -	struct mutex			channel_0_lock;
 +	spinlock_t			channel_0_lock;
  	struct sdma_script_start_addrs	*script_addrs;
  };

Attachment: pgp00000.pgp
Description: PGP signature