|
@@ -47,7 +47,7 @@ MODULE_ALIAS("platform:pxa2xx-spi");
|
|
|
|
|
|
#define DMA_INT_MASK (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)
|
|
|
#define RESET_DMA_CHANNEL (DCSR_NODESC | DMA_INT_MASK)
|
|
|
-#define IS_DMA_ALIGNED(x) ((((u32)(x)) & 0x07) == 0)
|
|
|
+#define IS_DMA_ALIGNED(x) IS_ALIGNED((unsigned long)(x), DMA_ALIGNMENT)
|
|
|
#define MAX_DMA_LEN 8191
|
|
|
#define DMA_ALIGNMENT 8
|
|
|
|
|
@@ -1576,8 +1576,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
|
|
|
master->transfer = transfer;
|
|
|
|
|
|
drv_data->ssp_type = ssp->type;
|
|
|
- drv_data->null_dma_buf = (u32 *)ALIGN((u32)(drv_data +
|
|
|
- sizeof(struct driver_data)), 8);
|
|
|
+ drv_data->null_dma_buf = (u32 *)PTR_ALIGN(&drv_data[1], DMA_ALIGNMENT);
|
|
|
|
|
|
drv_data->ioaddr = ssp->mmio_base;
|
|
|
drv_data->ssdr_physical = ssp->phys_base + SSDR;
|