sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMV71: Fix SPI compilation errors when SPI DMA is enabled

Browse Source
This commit is contained in:
Gregory Nutt 2015-09-29 07:31:21 -06:00
parent 82cc93c71b
commit cd6b51847b
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/src/samv7/sam_spi.c
View File

@ -59,6 +59,7 @@
#include "up_internal.h" #include "up_internal.h"
#include "up_arch.h" #include "up_arch.h"
#include "cache.h"
#include "sam_gpio.h" #include "sam_gpio.h"
#include "sam_xdmac.h" #include "sam_xdmac.h"
@ -207,8 +208,7 @@ struct sam_spidev_s
select_t select; /* SPI select call-out */ select_t select; /* SPI select call-out */
bool initialized; /* TRUE: Controller has been initialized */ bool initialized; /* TRUE: Controller has been initialized */
#ifdef CONFIG_SAMV7_SPI_DMA #ifdef CONFIG_SAMV7_SPI_DMA
uint8_t rxintf; /* RX hardware interface number */ uint8_t pid; /* SPI peripheral ID */
uint8_t txintf; /* TX hardware interface number */
#endif #endif
/* Debug stuff */ /* Debug stuff */
@ -342,8 +342,7 @@ static struct sam_spidev_s g_spi0dev =
.base = SAM_SPI0_BASE, .base = SAM_SPI0_BASE,
.select = sam_spi0select, .select = sam_spi0select,
#ifdef CONFIG_SAMV7_SPI_DMA #ifdef CONFIG_SAMV7_SPI_DMA
.rxintf = DMACHAN_INTF_SPI0RX, .pid = SAM_PID_SPI0,
.txintf = DMACHAN_INTF_SPI0TX,
#endif #endif
}; };
#endif #endif
@ -381,8 +380,7 @@ static struct sam_spidev_s g_spi1dev =
.base = SAM_SPI1_BASE, .base = SAM_SPI1_BASE,
.select = sam_spi1select, .select = sam_spi1select,
#ifdef CONFIG_SAMV7_SPI_DMA #ifdef CONFIG_SAMV7_SPI_DMA
.rxintf = DMACHAN_INTF_SPI1RX, .pid = SAM_PID_SPI1,
.txintf = DMACHAN_INTF_SPI1TX,
#endif #endif
}; };
#endif #endif
@ -1466,11 +1464,9 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
/* Configure the RX DMA channel */ /* Configure the RX DMA channel */
rxflags = DMACH_FLAG_FIFOCFG_LARGEST | rxflags = DMACH_FLAG_FIFOCFG_LARGEST | DMACH_FLAG_PERIPHPID(spi->pid) |
((uint32_t)spi->rxintf << DMACH_FLAG_PERIPHPID_SHIFT) |
DMACH_FLAG_PERIPHH2SEL | DMACH_FLAG_PERIPHISPERIPH | DMACH_FLAG_PERIPHH2SEL | DMACH_FLAG_PERIPHISPERIPH |
DMACH_FLAG_PERIPHCHUNKSIZE_1 | DMACH_FLAG_PERIPHCHUNKSIZE_1 | DMACH_FLAG_MEMPID_MAX |
((uint32_t)(15) << DMACH_FLAG_MEMPID_SHIFT) |
DMACH_FLAG_MEMCHUNKSIZE_1; DMACH_FLAG_MEMCHUNKSIZE_1;
/* Set the source and destination width bits */ /* Set the source and destination width bits */
@ -1495,7 +1491,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
* the DMA completes * the DMA completes
*/ */
sam_cmcc_invalidate((uintptr_t)rxbuffer, (uintptr_t)rxbuffer + nbytes); arch_invalidate_dcache((uintptr_t)rxbuffer, (uintptr_t)rxbuffer + nbytes);
/* Use normal RX memory incrementing. */ /* Use normal RX memory incrementing. */
@ -1504,11 +1500,9 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
/* Configure the TX DMA channel */ /* Configure the TX DMA channel */
txflags = DMACH_FLAG_FIFOCFG_LARGEST | txflags = DMACH_FLAG_FIFOCFG_LARGEST | DMACH_FLAG_PERIPHPID(spi->pid) |
((uint32_t)spi->txintf << DMACH_FLAG_PERIPHPID_SHIFT) |
DMACH_FLAG_PERIPHH2SEL | DMACH_FLAG_PERIPHISPERIPH | DMACH_FLAG_PERIPHH2SEL | DMACH_FLAG_PERIPHISPERIPH |
DMACH_FLAG_PERIPHCHUNKSIZE_1 | DMACH_FLAG_PERIPHCHUNKSIZE_1 | DMACH_FLAG_MEMPID_MAX |
((uint32_t)(15) << DMACH_FLAG_MEMPID_SHIFT) |
DMACH_FLAG_MEMCHUNKSIZE_1; DMACH_FLAG_MEMCHUNKSIZE_1;
/* Set the source and destination width bits */ /* Set the source and destination width bits */
@ -1782,14 +1776,11 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
spics->candma = spino ? SAMV7_SPI1_DMA : SAMV7_SPI0_DMA; spics->candma = spino ? SAMV7_SPI1_DMA : SAMV7_SPI0_DMA;
/* Pre-allocate DMA channels. These allocations exploit that fact that /* Pre-allocate DMA channels. */
* SPI0 is managed by DMAC0 and SPI1 is managed by DMAC1. Hence,
* the SPI number (spino) is the same as the DMAC number.
*/
if (spics->candma) if (spics->candma)
{ {
spics->rxdma = sam_dmachannel(0); spics->rxdma = sam_dmachannel(0, 0);
if (!spics->rxdma) if (!spics->rxdma)
{ {
spidbg("ERROR: Failed to allocate the RX DMA channel\n"); spidbg("ERROR: Failed to allocate the RX DMA channel\n");
@ -1799,7 +1790,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
if (spics->candma) if (spics->candma)
{ {
spics->txdma = sam_dmachannel(0); spics->txdma = sam_dmachannel(0, 0);
if (!spics->txdma) if (!spics->txdma)
{ {
spidbg("ERROR: Failed to allocate the TX DMA channel\n"); spidbg("ERROR: Failed to allocate the TX DMA channel\n");