From fcb38a2e589ebf4dc345abf5724930dd5da9c8bc Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Mon, 6 Apr 2009 19:00:57 -0700 Subject: [PATCH] --- yaml --- r: 142569 b: refs/heads/master c: 7ad0ba91d47ff539fe114875bd0a319fba29c9b5 h: refs/heads/master i: 142567: 09a01cb61cc845de47489e44ad6e7f14ab238af1 v: v3 --- [refs] | 2 +- trunk/drivers/spi/pxa2xx_spi.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 77f6afae974c..23c86b590873 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd5e191e7610eb7ecb5e35b2045ceb6554bea15a +refs/heads/master: 7ad0ba91d47ff539fe114875bd0a319fba29c9b5 diff --git a/trunk/drivers/spi/pxa2xx_spi.c b/trunk/drivers/spi/pxa2xx_spi.c index 70ff0072cb8a..c1688c71f052 100644 --- a/trunk/drivers/spi/pxa2xx_spi.c +++ b/trunk/drivers/spi/pxa2xx_spi.c @@ -54,6 +54,7 @@ MODULE_ALIAS("platform:pxa2xx-spi"); #define RESET_DMA_CHANNEL (DCSR_NODESC | DMA_INT_MASK) #define IS_DMA_ALIGNED(x) ((((u32)(x)) & 0x07) == 0) #define MAX_DMA_LEN 8191 +#define DMA_ALIGNMENT 8 /* * for testing SSCR1 changes that require SSP restart, basically @@ -1498,6 +1499,7 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev) master->bus_num = pdev->id; master->num_chipselect = platform_info->num_chipselect; + master->dma_alignment = DMA_ALIGNMENT; master->cleanup = cleanup; master->setup = setup; master->transfer = transfer;