@@ -475,28 +475,14 @@ static struct resource s3c2443_dma_resource[] = {
[6] = DEFINE_RES_IRQ(IRQ_S3C2443_DMA5),
};
-static struct s3c24xx_dma_channel s3c2443_dma_channels[DMACH_MAX] = {
+static struct dma_slave_map s3c2443_dma_channels[] = {
- [DMACH_XD0] = { S3C24XX_DMA_AHB, true, 17 },
- [DMACH_XD1] = { S3C24XX_DMA_AHB, true, 18 },
- [DMACH_SDI] = { S3C24XX_DMA_APB, false, 10 },
- [DMACH_SPI0_RX] = { S3C24XX_DMA_APB, true, 1 },
- [DMACH_SPI0_TX] = { S3C24XX_DMA_APB, true, 0 },
- [DMACH_SPI1_RX] = { S3C24XX_DMA_APB, true, 3 },
- [DMACH_SPI1_TX] = { S3C24XX_DMA_APB, true, 2 },
+ { "xd0", "data", S3C_DMA_SLAVE(S3C24XX_DMA_AHB, true, 17) },
+ { "xd1", "data", S3C_DMA_SLAVE(S3C24XX_DMA_AHB, true, 18) },
+ { "3c2440-sdi", "data", S3C_DMA_SLAVE(S3C24XX_DMA_APB, false, 10) },
+ { "s3c2410-spi.0", "rx", S3C_DMA_SLAVE(S3C24XX_DMA_APB, true, 1) },
+ { "s3c2410-spi.0", "tx", S3C_DMA_SLAVE(S3C24XX_DMA_APB, true, 0) },
+ { "s3c2410-spi.1", "rx", S3C_DMA_SLAVE(S3C24XX_DMA_APB, true, 3) },
+ { "s3c2410-spi.1", "tx", S3C_DMA_SLAVE(S3C24XX_DMA_APB, true, 2) },
...
};
static struct s3c24xx_dma_platdata s3c2443_dma_platdata = {
For this patch:
Acked-by: Arnd Bergmann <arnd@arndb.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html