From 3ce275436e56d72c9af99ee4a739b7732a986a83 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Sun, 22 Jul 2018 09:35:44 +0800 Subject: board: Clean up DMA channel mapping The code to remap DMA channels on STM32F09x is a little obscure, let's try to make it a bit clearer by using simpler masks. A more proper fix might be to setup better macros, or use the existing dma_select_channel function, but this already improves readability. BRANCH=none BUG=b:80159522 TEST=Flash kukui, see that UART and eMMC emulation work. TEST=Compare binaries for elm kukui oak rainier rowan scarlet before and after this change, and see that resulting binaries are identical. Change-Id: Id4d2b9cfec86230b2329fa04a4c1992ec13be4e1 Signed-off-by: Nicolas Boichat Reviewed-on: https://chromium-review.googlesource.com/1146128 Reviewed-by: Yilun Lin --- board/scarlet/board.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'board/scarlet') diff --git a/board/scarlet/board.c b/board/scarlet/board.c index fb40b6d0cf..9eb055e9f6 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -267,12 +267,11 @@ void board_config_pre_init(void) /* * Remap USART1 and SPI2 DMA: * - * Ch4: USART1_TX / Ch5: USART1_RX - * Ch6: SPI2_RX / Ch7: SPI2_TX + * Ch4: USART1_TX / Ch5: USART1_RX (1000) + * Ch6: SPI2_RX / Ch7: SPI2_TX (0011) */ - STM32_DMA_CSELR(STM32_DMAC_CH4) = (1 << 15) | (1 << 19) | - (1 << 20) | (1 << 21) | - (1 << 24) | (1 << 25); + STM32_DMA_CSELR(STM32_DMAC_CH4) = (8 << 12) | (8 << 16) | + (3 << 20) | (3 << 24); } enum scarlet_board_version { -- cgit v1.2.1