From e9354361b00b98c36ef5e39dbb9def82a5641af1 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Wed, 12 Jan 2011 12:12:31 +0100
Subject: [PATCH] --- yaml --- r: 233290 b: refs/heads/master c:
 b9b3f82f94b52ebb0bbdf6cd77ccc5e8ee3f53b5 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/dma/imx-dma.c  | 26 ++++----------------------
 trunk/drivers/dma/imx-sdma.c |  3 +++
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index fef94b3e3387..83d01216ef3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8a356ff96a9070156f863e4f7716e2a0eb8c995
+refs/heads/master: b9b3f82f94b52ebb0bbdf6cd77ccc5e8ee3f53b5
diff --git a/trunk/drivers/dma/imx-dma.c b/trunk/drivers/dma/imx-dma.c
index e18eaabe92b9..e53d438142bb 100644
--- a/trunk/drivers/dma/imx-dma.c
+++ b/trunk/drivers/dma/imx-dma.c
@@ -49,7 +49,6 @@ struct imxdma_channel {
 
 struct imxdma_engine {
 	struct device			*dev;
-	struct device_dma_parameters	dma_parms;
 	struct dma_device		dma_device;
 	struct imxdma_channel		channel[MAX_DMA_CHANNELS];
 };
@@ -243,21 +242,6 @@ static struct dma_async_tx_descriptor *imxdma_prep_slave_sg(
 	else
 		dmamode = DMA_MODE_WRITE;
 
-	switch (imxdmac->word_size) {
-	case DMA_SLAVE_BUSWIDTH_4_BYTES:
-		if (sgl->length & 3 || sgl->dma_address & 3)
-			return NULL;
-		break;
-	case DMA_SLAVE_BUSWIDTH_2_BYTES:
-		if (sgl->length & 1 || sgl->dma_address & 1)
-			return NULL;
-		break;
-	case DMA_SLAVE_BUSWIDTH_1_BYTE:
-		break;
-	default:
-		return NULL;
-	}
-
 	ret = imx_dma_setup_sg(imxdmac->imxdma_channel, sgl, sg_len,
 		 dma_length, imxdmac->per_address, dmamode);
 	if (ret)
@@ -345,9 +329,6 @@ static int __init imxdma_probe(struct platform_device *pdev)
 
 	INIT_LIST_HEAD(&imxdma->dma_device.channels);
 
-	dma_cap_set(DMA_SLAVE, imxdma->dma_device.cap_mask);
-	dma_cap_set(DMA_CYCLIC, imxdma->dma_device.cap_mask);
-
 	/* Initialize channel parameters */
 	for (i = 0; i < MAX_DMA_CHANNELS; i++) {
 		struct imxdma_channel *imxdmac = &imxdma->channel[i];
@@ -365,7 +346,11 @@ static int __init imxdma_probe(struct platform_device *pdev)
 		imxdmac->imxdma = imxdma;
 		spin_lock_init(&imxdmac->lock);
 
+		dma_cap_set(DMA_SLAVE, imxdma->dma_device.cap_mask);
+		dma_cap_set(DMA_CYCLIC, imxdma->dma_device.cap_mask);
+
 		imxdmac->chan.device = &imxdma->dma_device;
+		imxdmac->chan.chan_id = i;
 		imxdmac->channel = i;
 
 		/* Add the channel to the DMAC list */
@@ -385,9 +370,6 @@ static int __init imxdma_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, imxdma);
 
-	imxdma->dma_device.dev->dma_parms = &imxdma->dma_parms;
-	dma_set_max_seg_size(imxdma->dma_device.dev, 0xffffff);
-
 	ret = dma_async_device_register(&imxdma->dma_device);
 	if (ret) {
 		dev_err(&pdev->dev, "unable to register\n");
diff --git a/trunk/drivers/dma/imx-sdma.c b/trunk/drivers/dma/imx-sdma.c
index d5a5d4d9c19b..c50305043f15 100644
--- a/trunk/drivers/dma/imx-sdma.c
+++ b/trunk/drivers/dma/imx-sdma.c
@@ -301,6 +301,7 @@ struct sdma_firmware_header {
 
 struct sdma_engine {
 	struct device			*dev;
+	struct device_dma_parameters	dma_parms;
 	struct sdma_channel		channel[MAX_DMA_CHANNELS];
 	struct sdma_channel_control	*channel_control;
 	void __iomem			*regs;
@@ -1317,6 +1318,8 @@ static int __init sdma_probe(struct platform_device *pdev)
 	sdma->dma_device.device_prep_dma_cyclic = sdma_prep_dma_cyclic;
 	sdma->dma_device.device_control = sdma_control;
 	sdma->dma_device.device_issue_pending = sdma_issue_pending;
+	sdma->dma_device.dev->dma_parms = &sdma->dma_parms;
+	dma_set_max_seg_size(sdma->dma_device.dev, 65535);
 
 	ret = dma_async_device_register(&sdma->dma_device);
 	if (ret) {