diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 13:06:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 13:17:22 -0400 |
commit | 563b444e33810f3120838620c990480304e24e63 (patch) | |
tree | 36ddfc2fa4e8d4cd8c99352e9b61c2b76057a387 /drivers/spi/spi-s3c64xx.c | |
parent | 142e07beabfa8850e9e433b986e217fb596b9774 (diff) |
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 <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi/spi-s3c64xx.c')
-rw-r--r-- | drivers/spi/spi-s3c64xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 4ab992bfea83..6d6537d09d4f 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | #include <linux/platform_data/spi-s3c64xx.h> | 35 | #include <linux/platform_data/spi-s3c64xx.h> |
36 | 36 | ||
37 | #ifdef CONFIG_SAMSUNG_DMADEV | 37 | #ifdef CONFIG_S3C_DMA |
38 | #include <mach/dma.h> | 38 | #include <mach/dma.h> |
39 | #endif | 39 | #endif |
40 | 40 | ||
@@ -199,7 +199,7 @@ struct s3c64xx_spi_driver_data { | |||
199 | unsigned cur_speed; | 199 | unsigned cur_speed; |
200 | struct s3c64xx_spi_dma_data rx_dma; | 200 | struct s3c64xx_spi_dma_data rx_dma; |
201 | struct s3c64xx_spi_dma_data tx_dma; | 201 | struct s3c64xx_spi_dma_data tx_dma; |
202 | #ifdef CONFIG_SAMSUNG_DMADEV | 202 | #ifdef CONFIG_S3C_DMA |
203 | struct samsung_dma_ops *ops; | 203 | struct samsung_dma_ops *ops; |
204 | #endif | 204 | #endif |
205 | struct s3c64xx_spi_port_config *port_conf; | 205 | struct s3c64xx_spi_port_config *port_conf; |
@@ -283,7 +283,7 @@ static void s3c64xx_spi_dmacb(void *data) | |||
283 | spin_unlock_irqrestore(&sdd->lock, flags); | 283 | spin_unlock_irqrestore(&sdd->lock, flags); |
284 | } | 284 | } |
285 | 285 | ||
286 | #ifdef CONFIG_SAMSUNG_DMADEV | 286 | #ifdef CONFIG_S3C_DMA |
287 | /* FIXME: remove this section once arch/arm/mach-s3c64xx uses dmaengine */ | 287 | /* FIXME: remove this section once arch/arm/mach-s3c64xx uses dmaengine */ |
288 | 288 | ||
289 | static struct s3c2410_dma_client s3c64xx_spi_dma_client = { | 289 | static struct s3c2410_dma_client s3c64xx_spi_dma_client = { |