Skip to content

Commit 563b444

Browse files
committed
spi/s3c64xx: Fix non-dmaengine usage
The multiplatform conversion in commit 788437 (spi: s3c64xx: move to generic dmaengine API) tested for the use of the Samsung-specific DMA API with SAMSUNG_DMADEV when in fact S3C_DMA should be used. This renderd DMA based transfers non-functional on platforms not using dmaengine. Signed-off-by: Mark Brown <[email protected]>
1 parent 142e07b commit 563b444

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/spi/spi-s3c64xx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
#include <linux/platform_data/spi-s3c64xx.h>
3636

37-
#ifdef CONFIG_SAMSUNG_DMADEV
37+
#ifdef CONFIG_S3C_DMA
3838
#include <mach/dma.h>
3939
#endif
4040

@@ -199,7 +199,7 @@ struct s3c64xx_spi_driver_data {
199199
unsigned cur_speed;
200200
struct s3c64xx_spi_dma_data rx_dma;
201201
struct s3c64xx_spi_dma_data tx_dma;
202-
#ifdef CONFIG_SAMSUNG_DMADEV
202+
#ifdef CONFIG_S3C_DMA
203203
struct samsung_dma_ops *ops;
204204
#endif
205205
struct s3c64xx_spi_port_config *port_conf;
@@ -283,7 +283,7 @@ static void s3c64xx_spi_dmacb(void *data)
283283
spin_unlock_irqrestore(&sdd->lock, flags);
284284
}
285285

286-
#ifdef CONFIG_SAMSUNG_DMADEV
286+
#ifdef CONFIG_S3C_DMA
287287
/* FIXME: remove this section once arch/arm/mach-s3c64xx uses dmaengine */
288288

289289
static struct s3c2410_dma_client s3c64xx_spi_dma_client = {

0 commit comments

Comments
 (0)