The patch titled spi_imx: set spi_master.dma_alignment = 4 has been added to the -mm tree. Its filename is spi_imx-set-spi_masterdma_alignment-=-4.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: spi_imx: set spi_master.dma_alignment = 4 From: Mike Rapoport <mike@xxxxxxxxxxxxxx> Signed-off-by: Mike Rapoport <mike@xxxxxxxxxxxxxx> Cc: Bryan Wu <bryan.wu@xxxxxxxxxx> Cc: David Brownell <david-b@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/spi/spi_imx.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/spi/spi_imx.c~spi_imx-set-spi_masterdma_alignment-=-4 drivers/spi/spi_imx.c --- a/drivers/spi/spi_imx.c~spi_imx-set-spi_masterdma_alignment-=-4 +++ a/drivers/spi/spi_imx.c @@ -186,6 +186,7 @@ #define QUEUE_STOPPED (1) #define IS_DMA_ALIGNED(x) (((u32)(x) & 0x03) == 0) +#define DMA_ALIGNMENT 4 /*-------------------------------------------------------------------------*/ @@ -1482,6 +1483,7 @@ static int __init spi_imx_probe(struct p 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; _ Patches currently in -mm which might be from mike@xxxxxxxxxxxxxx are linux-next.patch spi_bfin5xx-remove-unused-is_dma_aligned-macro.patch spi-add-dma_alignment-field-to-spi_master.patch pxa2xx_spi-set-spi_masterdma_alignment-=-8.patch spi_imx-set-spi_masterdma_alignment-=-4.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html