diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-02-25 22:07:32 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-04 09:22:44 -0400 |
commit | 26aafa77df61c4190eae80646211ee6f07c88eaf (patch) | |
tree | 5ae896947ebde38999bd5271a8a13ad09a2b117d /include/linux/spi | |
parent | 0e91e434c86c84e84c46cf8bff2b5e53daee85d5 (diff) |
spi: mxs-spi: move to use generic DMA helper
With the generic DMA device tree helper supported by mxs-dma driver,
client devices only need to call dma_request_slave_channel() for
requesting a DMA channel from dmaengine.
Since mxs is a DT only platform now, along with the changes, the non-DT
case handling in probe function also gets removed.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/spi')
-rw-r--r-- | include/linux/spi/mxs-spi.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/spi/mxs-spi.h b/include/linux/spi/mxs-spi.h index 61ae1306db23..4835486f58e5 100644 --- a/include/linux/spi/mxs-spi.h +++ b/include/linux/spi/mxs-spi.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #ifndef __LINUX_SPI_MXS_SPI_H__ | 24 | #ifndef __LINUX_SPI_MXS_SPI_H__ |
25 | #define __LINUX_SPI_MXS_SPI_H__ | 25 | #define __LINUX_SPI_MXS_SPI_H__ |
26 | 26 | ||
27 | #include <linux/fsl/mxs-dma.h> | 27 | #include <linux/dmaengine.h> |
28 | 28 | ||
29 | #define ssp_is_old(host) ((host)->devid == IMX23_SSP) | 29 | #define ssp_is_old(host) ((host)->devid == IMX23_SSP) |
30 | 30 | ||
@@ -137,9 +137,7 @@ struct mxs_ssp { | |||
137 | unsigned int clk_rate; | 137 | unsigned int clk_rate; |
138 | enum mxs_ssp_id devid; | 138 | enum mxs_ssp_id devid; |
139 | 139 | ||
140 | int dma_channel; | ||
141 | struct dma_chan *dmach; | 140 | struct dma_chan *dmach; |
142 | struct mxs_dma_data dma_data; | ||
143 | unsigned int dma_dir; | 141 | unsigned int dma_dir; |
144 | enum dma_transfer_direction slave_dirn; | 142 | enum dma_transfer_direction slave_dirn; |
145 | u32 ssp_pio_words[SSP_PIO_NUM]; | 143 | u32 ssp_pio_words[SSP_PIO_NUM]; |