Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 563b444e authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 142e07be

drivers/spi/spi-s3c64xx.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ 




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

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





#ifdef CONFIG_SAMSUNG_DMADEV

#ifdef CONFIG_S3C_DMA

#include <mach/dma.h>

#include <mach/dma.h>

#endif

#endif
@@ -199,7 +199,7 @@ struct s3c64xx_spi_driver_data { 
	unsigned                        cur_speed;

	unsigned                        cur_speed;

	struct s3c64xx_spi_dma_data	rx_dma;

	struct s3c64xx_spi_dma_data	rx_dma;

	struct s3c64xx_spi_dma_data	tx_dma;

	struct s3c64xx_spi_dma_data	tx_dma;

#ifdef CONFIG_SAMSUNG_DMADEV

#ifdef CONFIG_S3C_DMA

	struct samsung_dma_ops		*ops;

	struct samsung_dma_ops		*ops;

#endif

#endif

	struct s3c64xx_spi_port_config	*port_conf;

	struct s3c64xx_spi_port_config	*port_conf;
@@ -283,7 +283,7 @@ static void s3c64xx_spi_dmacb(void *data) 
	spin_unlock_irqrestore(&sdd->lock, flags);

	spin_unlock_irqrestore(&sdd->lock, flags);

}

}





#ifdef CONFIG_SAMSUNG_DMADEV

#ifdef CONFIG_S3C_DMA

/* FIXME: remove this section once arch/arm/mach-s3c64xx uses dmaengine */

/* FIXME: remove this section once arch/arm/mach-s3c64xx uses dmaengine */





static struct s3c2410_dma_client s3c64xx_spi_dma_client = {

static struct s3c2410_dma_client s3c64xx_spi_dma_client = {