mxs: spi: Fix the MXS SPI for mx23
Subsystems (2)
PATCH 1/2 mxs: spi: Fix the MXS SPI for mx23
The MX23 has slightly different register layout. Adjust the SPI driver to match the layout, both the PIO and DMA part.
Signed-off-by Marek Vasut <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Otavio Salvador <[email protected]>
Cc Stefano Babic <[email protected]>
--- drivers/spi/mxs_spi.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
NOTE: COMPILE TESTED ONLY!!! Someone please test before applying!
drivers/spi/mxs_spi.c +17 -2
@@ -168,7 +168,12 @@ static int mxs_spi_xfer_pio(struct mxs_spi_slave *slave,while (length--) {/* We transfer 1 byte */ +#if defined(CONFIG_MX23 ) +writel (SSP_CTRL0_XFER_COUNT_MASK , &ssp_regs->hw_ssp_ctrl0_clr); +writel (1 , &ssp_regs->hw_ssp_ctrl0_set); +#elif defined(CONFIG_MX28 )writel (1 , &ssp_regs->hw_ssp_xfer_size); +#endif if ((flags &SPI_XFER_END ) && !length)mxs_spi_end_xfer (ssp_regs);
@@ -226,6 +231,12 @@ static int mxs_spi_xfer_dma(struct mxs_spi_slave *slave,int tl;int ret =0 ; +#if defined(CONFIG_MX23 ) +const int mxs_spi_pio_words =1 ; +#elif defined(CONFIG_MX28 ) +const int mxs_spi_pio_words =4 ; +#endif + ALLOC_CACHE_ALIGN_BUFFER(struct mxs_dma_desc, desc, desc_count);memset (desc,0 ,sizeof (struct mxs_dma_desc ) * desc_count);
@@ -281,7 +292,7 @@ static int mxs_spi_xfer_dma(struct mxs_spi_slave *slave, dp->cmd.data |= ((tl &0xffff ) <<MXS_DMA_DESC_BYTES_OFFSET ) | - (4 <<MXS_DMA_DESC_PIO_WORDS_OFFSET ) | + (mxs_spi_pio_words <<MXS_DMA_DESC_PIO_WORDS_OFFSET ) |MXS_DMA_DESC_HALT_ON_TERMINATE |MXS_DMA_DESC_TERMINATE_FLUSH ;
@@ -298,15 +309,19 @@ static int mxs_spi_xfer_dma(struct mxs_spi_slave *slave, }/* -* Write CTRL0, CMD0, CMD1, XFER_SIZE registers. It is +* Write CTRL0, CMD0, CMD1 and XFER_SIZE registers in +* case of MX28, write only CTRL0 in case of MX23 due +* to the difference in register layout. It is utterly * essential that the XFER_SIZE register is written on * a per-descriptor basis with the same size as is the * descriptor! */ dp->cmd.pio_words[0 ] = ctrl0; +#ifdef CONFIG_MX28 dp->cmd.pio_words[1 ] =0 ; dp->cmd.pio_words[2 ] =0 ; dp->cmd.pio_words[3 ] = tl; +#endif mxs_dma_desc_append (dmach, dp);
Signature · 1 line
1.7.10.4
PATCH 2/2 mxs: spi: Remove CONFIG_MXS_SPI_DMA_ENABLE
The CONFIG_MXS_SPI_DMA_ENABLE is no longer relevant as the SPI DMA has proven to work correctly. Remove this configuration option.
Signed-off-by Marek Vasut <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Otavio Salvador <[email protected]>
Cc Stefano Babic <[email protected]>
--- drivers/spi/mxs_spi.c | 16 ---------------- include/configs/m28evk.h | 1 - include/configs/mx28evk.h | 1 - 3 files changed, 18 deletions(-)
NOTE: COMPILE TESTED ONLY!!! Someone please test before applying!
drivers/spi/mxs_spi.c +0 -16
@@ -40,17 +40,6 @@#define MXSSSP_SMALL_TRANSFER 512 -/* -* CONFIG_MXS_SPI_DMA_ENABLE: Experimental mixed PIO/DMA support for MXS SPI -* host. Use with utmost caution! -* -* Enabling this is not yet recommended since this -* still doesn't support transfers to/from unaligned -* addresses. Therefore this driver will not work -* for example with saving environment. This is -* caused by DMA alignment constraints on MXS. -*/ -struct mxs_spi_slave {struct spi_slave slave;uint32_t max_khz;
@@ -347,12 +336,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen,char dummy;int write =0 ;char *data =NULL ; - -#ifdef CONFIG_MXS_SPI_DMA_ENABLE int dma =1 ; -#else -int dma =0 ; -#endif if (bitlen ==0 ) {if (flags &SPI_XFER_END ) {
include/configs/m28evk.h +0 -1
@@ -244,7 +244,6 @@#ifdef CONFIG_CMD_SPI #define CONFIG_HARD_SPI #define CONFIG_MXS_SPI -#define CONFIG_MXS_SPI_DMA_ENABLE #define CONFIG_SPI_HALF_DUPLEX #define CONFIG_DEFAULT_SPI_BUS 2#define CONFIG_DEFAULT_SPI_CS 0
include/configs/mx28evk.h +0 -1
@@ -202,7 +202,6 @@#ifdef CONFIG_CMD_SPI #define CONFIG_HARD_SPI #define CONFIG_MXS_SPI -#define CONFIG_MXS_SPI_DMA_ENABLE #define CONFIG_SPI_HALF_DUPLEX #define CONFIG_DEFAULT_SPI_BUS 2#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
Signature · 1 line
1.7.10.4