aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Rapoport <mike@compulab.co.il>2009-04-06 22:00:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:07 -0400
commit96a6d9aa096aeb758273a8fb6388c279ecef5e7e (patch)
treee374445fc142091dea2640caa26c16e2bbf09414
parent7ad0ba91d47ff539fe114875bd0a319fba29c9b5 (diff)
spi_imx: set spi_master.dma_alignment = 4
Signed-off-by: Mike Rapoport <mike@compulab.co.il> Cc: Bryan Wu <bryan.wu@analog.com> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/spi/spi_imx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 014af69fc1bb..0671aeef5792 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -186,6 +186,7 @@
186#define QUEUE_STOPPED (1) 186#define QUEUE_STOPPED (1)
187 187
188#define IS_DMA_ALIGNED(x) (((u32)(x) & 0x03) == 0) 188#define IS_DMA_ALIGNED(x) (((u32)(x) & 0x03) == 0)
189#define DMA_ALIGNMENT 4
189/*-------------------------------------------------------------------------*/ 190/*-------------------------------------------------------------------------*/
190 191
191 192
@@ -1482,6 +1483,7 @@ static int __init spi_imx_probe(struct platform_device *pdev)
1482 1483
1483 master->bus_num = pdev->id; 1484 master->bus_num = pdev->id;
1484 master->num_chipselect = platform_info->num_chipselect; 1485 master->num_chipselect = platform_info->num_chipselect;
1486 master->dma_alignment = DMA_ALIGNMENT;
1485 master->cleanup = cleanup; 1487 master->cleanup = cleanup;
1486 master->setup = setup; 1488 master->setup = setup;
1487 master->transfer = transfer; 1489 master->transfer = transfer;