From b8476c7ee8bfe6f4fe060eb6428d98b3b037092c Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 13 Mar 2015 07:06:46 -0600 Subject: [PATCH] STM32: Fix RX DMA setup for UART5. From Jussi Kivilinna. --- arch/arm/src/stm32/chip/stm32f10xxx_dma.h | 4 ++-- arch/arm/src/stm32/stm32_serial.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/stm32/chip/stm32f10xxx_dma.h b/arch/arm/src/stm32/chip/stm32f10xxx_dma.h index d9ba761707a..a24c611a50a 100644 --- a/arch/arm/src/stm32/chip/stm32f10xxx_dma.h +++ b/arch/arm/src/stm32/chip/stm32f10xxx_dma.h @@ -338,13 +338,13 @@ # define DMACHAN_TIM4_UP STM32_DMA1_CHAN7 # define DMACHAN_SPI3_RX STM32_DMA2_CHAN1 -# define DMACHAN_USART5_TX STM32_DMA2_CHAN1 +# define DMACHAN_UART5_TX STM32_DMA2_CHAN1 # define DMACHAN_TIM5_CH4 STM32_DMA2_CHAN1 # define DMACHAN_TIM5_TRIG STM32_DMA2_CHAN1 # define DMACHAN_TIM5_COM STM32_DMA2_CHAN1 # define DMACHAN_SPI3_TX STM32_DMA2_CHAN2 -# define DMACHAN_USART5_RX STM32_DMA2_CHAN2 +# define DMACHAN_UART5_RX STM32_DMA2_CHAN2 # define DMACHAN_TIM5_CH3 STM32_DMA2_CHAN2 # define DMACHAN_TIM5_UP STM32_DMA2_CHAN2 diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c index da254c2bb79..2d2273d4278 100644 --- a/arch/arm/src/stm32/stm32_serial.c +++ b/arch/arm/src/stm32/stm32_serial.c @@ -159,9 +159,9 @@ # endif # endif -# if defined(CONFIG_UART4_RXDMA) +# if defined(CONFIG_UART4_RXDMA) || defined(CONFIG_UART5_RXDMA) # ifndef CONFIG_STM32_DMA2 -# error STM32 UART4 receive DMA requires CONFIG_STM32_DMA2 +# error STM32 UART4/5 receive DMA requires CONFIG_STM32_DMA2 # endif # endif @@ -171,6 +171,7 @@ # define DMAMAP_USART2_RX DMACHAN_USART2_RX # define DMAMAP_USART3_RX DMACHAN_USART3_RX # define DMAMAP_UART4_RX DMACHAN_UART4_RX +# define DMAMAP_UART5_RX DMACHAN_UART5_RX # endif