aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-pxa2xx.h
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2016-01-13 09:20:07 -0500
committerMark Brown <broonie@kernel.org>2016-01-15 13:13:17 -0500
commit22a33632fb607a18148815548478265a672d5295 (patch)
treee86893dbd573676bcc1426e117767a5efa2a16d2 /drivers/spi/spi-pxa2xx.h
parentd599af65fda384b5e91780485f243c9f2d3e757d (diff)
spi: pxa2xx: Remove CONFIG_SPI_PXA2XX_DMA
After removal of legacy PXA DMA code by the commit 6356437e65c2 ("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: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-pxa2xx.h')
-rw-r--r--drivers/spi/spi-pxa2xx.h35
1 files changed, 0 insertions, 35 deletions
diff --git a/drivers/spi/spi-pxa2xx.h b/drivers/spi/spi-pxa2xx.h
index 58efa98313aa..8e781c8b4374 100644
--- a/drivers/spi/spi-pxa2xx.h
+++ b/drivers/spi/spi-pxa2xx.h
@@ -147,20 +147,9 @@ static inline void write_SSSR_CS(struct driver_data *drv_data, u32 val)
147extern int pxa2xx_spi_flush(struct driver_data *drv_data); 147extern int pxa2xx_spi_flush(struct driver_data *drv_data);
148extern void *pxa2xx_spi_next_transfer(struct driver_data *drv_data); 148extern void *pxa2xx_spi_next_transfer(struct driver_data *drv_data);
149 149
150/*
151 * Select the right DMA implementation.
152 */
153#if defined(CONFIG_SPI_PXA2XX_DMA)
154#define SPI_PXA2XX_USE_DMA 1
155#define MAX_DMA_LEN SZ_64K 150#define MAX_DMA_LEN SZ_64K
156#define DEFAULT_DMA_CR1 (SSCR1_TSRE | SSCR1_RSRE | SSCR1_TRAIL) 151#define DEFAULT_DMA_CR1 (SSCR1_TSRE | SSCR1_RSRE | SSCR1_TRAIL)
157#else
158#undef SPI_PXA2XX_USE_DMA
159#define MAX_DMA_LEN 0
160#define DEFAULT_DMA_CR1 0
161#endif
162 152
163#ifdef SPI_PXA2XX_USE_DMA
164extern bool pxa2xx_spi_dma_is_possible(size_t len); 153extern bool pxa2xx_spi_dma_is_possible(size_t len);
165extern int pxa2xx_spi_map_dma_buffers(struct driver_data *drv_data); 154extern int pxa2xx_spi_map_dma_buffers(struct driver_data *drv_data);
166extern irqreturn_t pxa2xx_spi_dma_transfer(struct driver_data *drv_data); 155extern 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,
173 u8 bits_per_word, 162 u8 bits_per_word,
174 u32 *burst_code, 163 u32 *burst_code,
175 u32 *threshold); 164 u32 *threshold);
176#else
177static inline bool pxa2xx_spi_dma_is_possible(size_t len) { return false; }
178static inline int pxa2xx_spi_map_dma_buffers(struct driver_data *drv_data)
179{
180 return 0;
181}
182#define pxa2xx_spi_dma_transfer NULL
183static inline void pxa2xx_spi_dma_prepare(struct driver_data *drv_data,
184 u32 dma_burst) {}
185static inline void pxa2xx_spi_dma_start(struct driver_data *drv_data) {}
186static inline int pxa2xx_spi_dma_setup(struct driver_data *drv_data)
187{
188 return 0;
189}
190static inline void pxa2xx_spi_dma_release(struct driver_data *drv_data) {}
191static inline int pxa2xx_spi_set_dma_burst_and_threshold(struct chip_data *chip,
192 struct spi_device *spi,
193 u8 bits_per_word,
194 u32 *burst_code,
195 u32 *threshold)
196{
197 return -ENODEV;
198}
199#endif
200 165
201#endif /* SPI_PXA2XX_H */ 166#endif /* SPI_PXA2XX_H */