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

Commit 22a33632 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

spi: pxa2xx: Remove CONFIG_SPI_PXA2XX_DMA 



After removal of legacy PXA DMA code by the commit 6356437e
("spi: spi-pxa2xx: remove legacy PXA DMA bits") the
CONFIG_SPI_PXA2XX_DMA follows the CONFIG_SPI_PXA2XX and cannot be disabled
alone. Therefore remove this config symbol and dead definitions from the
spi-pxa2xx.h.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d599af65

drivers/spi/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -415,10 +415,6 @@ config SPI_PPC4xx 
	help

	  This selects a driver for the PPC4xx SPI Controller.



config SPI_PXA2XX_DMA

	def_bool y

	depends on SPI_PXA2XX



config SPI_PXA2XX

	tristate "PXA2xx SSP SPI master"

	depends on (ARCH_PXA || PCI || ACPI)

drivers/spi/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ obj-$(CONFIG_SPI_TI_QSPI) += spi-ti-qspi.o 
obj-$(CONFIG_SPI_ORION)			+= spi-orion.o

obj-$(CONFIG_SPI_PL022)			+= spi-pl022.o

obj-$(CONFIG_SPI_PPC4xx)		+= spi-ppc4xx.o

spi-pxa2xx-platform-objs		:= spi-pxa2xx.o

spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA)	+= spi-pxa2xx-dma.o

spi-pxa2xx-platform-objs		:= spi-pxa2xx.o spi-pxa2xx-dma.o

obj-$(CONFIG_SPI_PXA2XX)		+= spi-pxa2xx-platform.o

obj-$(CONFIG_SPI_PXA2XX_PCI)		+= spi-pxa2xx-pci.o

obj-$(CONFIG_SPI_QUP)			+= spi-qup.o

drivers/spi/spi-pxa2xx.h

+0 −35
Original line number Diff line number Diff line
@@ -147,20 +147,9 @@ static inline void write_SSSR_CS(struct driver_data *drv_data, u32 val) 
extern int pxa2xx_spi_flush(struct driver_data *drv_data);

extern void *pxa2xx_spi_next_transfer(struct driver_data *drv_data);



/*

 * Select the right DMA implementation.

 */

#if defined(CONFIG_SPI_PXA2XX_DMA)

#define SPI_PXA2XX_USE_DMA	1

#define MAX_DMA_LEN		SZ_64K

#define DEFAULT_DMA_CR1		(SSCR1_TSRE | SSCR1_RSRE | SSCR1_TRAIL)

#else

#undef SPI_PXA2XX_USE_DMA

#define MAX_DMA_LEN		0

#define DEFAULT_DMA_CR1		0

#endif



#ifdef SPI_PXA2XX_USE_DMA

extern bool pxa2xx_spi_dma_is_possible(size_t len);

extern int pxa2xx_spi_map_dma_buffers(struct driver_data *drv_data);

extern irqreturn_t pxa2xx_spi_dma_transfer(struct driver_data *drv_data);
@@ -173,29 +162,5 @@ extern int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip, 
						  u8 bits_per_word,

						  u32 *burst_code,

						  u32 *threshold);

#else

static inline bool pxa2xx_spi_dma_is_possible(size_t len) { return false; }

static inline int pxa2xx_spi_map_dma_buffers(struct driver_data *drv_data)

{

	return 0;

}

#define pxa2xx_spi_dma_transfer NULL

static inline void pxa2xx_spi_dma_prepare(struct driver_data *drv_data,

					  u32 dma_burst) {}

static inline void pxa2xx_spi_dma_start(struct driver_data *drv_data) {}

static inline int pxa2xx_spi_dma_setup(struct driver_data *drv_data)

{

	return 0;

}

static inline void pxa2xx_spi_dma_release(struct driver_data *drv_data) {}

static inline int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip,

							 struct spi_device *spi,

							 u8 bits_per_word,

							 u32 *burst_code,

							 u32 *threshold)

{

	return -ENODEV;

}

#endif



#endif /* SPI_PXA2XX_H */