diff options
| -rw-r--r-- | board/elm/board.c | 5 | ||||
| -rw-r--r-- | board/kukui/board.c | 4 | ||||
| -rw-r--r-- | board/oak/board.c | 4 | ||||
| -rw-r--r-- | board/rainier/board.c | 9 | ||||
| -rw-r--r-- | board/rowan/board.c | 3 | ||||
| -rw-r--r-- | board/scarlet/board.c | 9 |
6 files changed, 15 insertions, 19 deletions
diff --git a/board/elm/board.c b/board/elm/board.c index 0e08f0d6da..7ebf20225b 100644 --- a/board/elm/board.c +++ b/board/elm/board.c @@ -268,9 +268,8 @@ static void board_init(void) /* Update VBUS supplier */ usb_charger_vbus_change(0, !gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L)); - /* Remap SPI2 to DMA channels 6 and 7 */ - REG32(STM32_DMA1_BASE + 0xa8) |= (1 << 20) | (1 << 21) | - (1 << 24) | (1 << 25); + /* Remap SPI2 to DMA channels 6 and 7 (0011) */ + STM32_DMA_CSELR(STM32_DMAC_CH6) |= (3 << 20) | (3 << 24); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); diff --git a/board/kukui/board.c b/board/kukui/board.c index 1906226cb0..b40a9eb98f 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -243,9 +243,9 @@ void board_config_pre_init(void) /* * Remap USART1: * - * Ch4: USART1_TX / Ch5: USART1_RX + * Ch4: USART1_TX / Ch5: USART1_RX (1000) */ - STM32_DMA_CSELR(STM32_DMAC_CH4) = (1 << 15) | (1 << 19); + STM32_DMA_CSELR(STM32_DMAC_CH4) = (8 << 12) | (8 << 16); } enum kukui_board_version { diff --git a/board/oak/board.c b/board/oak/board.c index a9f05c4e86..ae5fbbbb2e 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -241,8 +241,8 @@ static void board_init(void) /* SPI sensors: put back the GPIO in its expected state */ gpio_set_level(GPIO_SPI2_NSS, 1); - /* Remap SPI2 to DMA channels 6 and 7 */ - REG32(STM32_DMA1_BASE + 0xa8) |= (1 << 20) | (1 << 21) | (1 << 24) | (1 << 25); + /* Remap SPI2 to DMA channels 6 and 7 (0011) */ + STM32_DMA_CSELR(STM32_DMAC_CH6) |= (3 << 20) | (3 << 24); /* Enable SPI for BMI160 */ gpio_config_module(MODULE_SPI_MASTER, 1); diff --git a/board/rainier/board.c b/board/rainier/board.c index e0831301ce..03e292bda4 100644 --- a/board/rainier/board.c +++ b/board/rainier/board.c @@ -243,12 +243,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); } void board_hibernate(void) diff --git a/board/rowan/board.c b/board/rowan/board.c index 2a0c7b4f0f..8feda44674 100644 --- a/board/rowan/board.c +++ b/board/rowan/board.c @@ -270,8 +270,7 @@ static void board_init(void) usb_charger_vbus_change(0, !gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L)); /* Remap SPI2 to DMA channels 6 and 7 */ - REG32(STM32_DMA1_BASE + 0xa8) |= (1 << 20) | (1 << 21) | - (1 << 24) | (1 << 25); + STM32_DMA_CSELR(STM32_DMAC_CH6) |= (3 << 20) | (3 << 24); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); 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 { |