diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c index ef1e53fbca..ec2b53c345 100644 --- a/arch/arm/src/samv7/sam_spi.c +++ b/arch/arm/src/samv7/sam_spi.c @@ -87,13 +87,13 @@ #ifdef CONFIG_SAMV7_SPI_DMA -# if defined(CONFIG_SAMV7_SPI0_MASTER) && defined(CONFIG_SAMV7_DMAC0) +# if defined(CONFIG_SAMV7_SPI0_MASTER) && defined(CONFIG_SAMV7_XDMAC) # define SAMV7_SPI0_DMA true # else # define SAMV7_SPI0_DMA false # endif -# if defined(CONFIG_SAMV7_SPI1_MASTER) && defined(CONFIG_SAMV7_DMAC1) +# if defined(CONFIG_SAMV7_SPI1_MASTER) && defined(CONFIG_SAMV7_XDMAC) # define SAMV7_SPI1_DMA true # else # define SAMV7_SPI1_DMA false diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c index 17f42e578f..f3381b007a 100644 --- a/arch/arm/src/samv7/sam_ssc.c +++ b/arch/arm/src/samv7/sam_ssc.c @@ -2982,17 +2982,14 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv) return ret; } - /* Allocate DMA channels. These allocations exploit that fact that - * SSC0 is managed by DMAC0 and SSC1 is managed by DMAC1. Hence, - * the SSC number (sscno) is the same as the DMAC number. - */ + /* Allocate DMA channels. */ #ifdef SSC_HAVE_RX if (priv->rxenab) { /* Allocate an RX DMA channel */ - priv->rx.dma = sam_dmachannel(priv->sscno, dmaflags); + priv->rx.dma = sam_dmachannel(0, dmaflags); if (!priv->rx.dma) { i2sdbg("ERROR: Failed to allocate the RX DMA channel\n"); @@ -3015,7 +3012,7 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv) { /* Allocate a TX DMA channel */ - priv->tx.dma = sam_dmachannel(priv->sscno, dmaflags); + priv->tx.dma = sam_dmachannel(0, dmaflags); if (!priv->tx.dma) { i2sdbg("ERROR: Failed to allocate the TX DMA channel\n");