From 9271f66273df450eb88b5c57a717adc9b2f690cd Mon Sep 17 00:00:00 2001
From: xiaofengvskuye <874364169@qq.com>
Date: Tue, 12 Jan 2021 16:12:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DNRF52840=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8SPI=E9=A9=B1=E5=8A=A8=E5=90=8E=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bsp/nrf5x/nrf52840/board/Kconfig | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bsp/nrf5x/nrf52840/board/Kconfig b/bsp/nrf5x/nrf52840/board/Kconfig
index 94715c0bb9..c49ae1f44f 100644
--- a/bsp/nrf5x/nrf52840/board/Kconfig
+++ b/bsp/nrf5x/nrf52840/board/Kconfig
@@ -325,6 +325,9 @@ menu "On-chip Peripheral Drivers"
                 bool "Enable SPI0 bus"
                 default y
             if BSP_USING_SPI0
+                config NRFX_SPI0_ENABLED
+                    int "Enable SPI0 instance"
+                    default 1
                 config BSP_SPI0_SCK_PIN
                     int "SPI0 sck pin number set"
                     range 0 47
@@ -347,6 +350,9 @@ menu "On-chip Peripheral Drivers"
                 bool "Enable SPI1 bus"
                 default n
             if BSP_USING_SPI1
+                config NRFX_SPI1_ENABLED
+                    int "Enable SPI1 instance"
+                    default 1
                 config BSP_SPI1_SCK_PIN
                     int "SPI0 sck pin number set"
                     range 0 47
@@ -369,6 +375,9 @@ menu "On-chip Peripheral Drivers"
                 bool "Enable SPI2 bus"
                 default n
             if BSP_USING_SPI2
+                config NRFX_SPI2_ENABLED
+                    int "Enable SPI2 instance"
+                    default 1
                 config BSP_SPI2_SCK_PIN
                     int "SPI0 sck pin number set"
                     range 0 47

From 9fb1520d0eabf94a74846e876be33114daf83cde Mon Sep 17 00:00:00 2001
From: Jedcheen <50920986+Jedcheen@users.noreply.github.com>
Date: Wed, 13 Jan 2021 11:31:03 +0800
Subject: [PATCH 2/2] fix imxrt uart2 wrong configure

---
 bsp/imxrt/libraries/drivers/drv_uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bsp/imxrt/libraries/drivers/drv_uart.c b/bsp/imxrt/libraries/drivers/drv_uart.c
index d471f29dec..fd5bfd1719 100644
--- a/bsp/imxrt/libraries/drivers/drv_uart.c
+++ b/bsp/imxrt/libraries/drivers/drv_uart.c
@@ -206,7 +206,7 @@ static void uart_get_dma_config(void)
     uarts[LPUART2_INDEX].dma_flag |= RT_DEVICE_FLAG_DMA_RX;
 #endif
 #ifdef BSP_LPUART2_TX_USING_DMA
-    static struct dma_tx_config uart2_dma_tx = {.request = kDmaRequestMuxLPUART4Tx, .channel = BSP_LPUART2_TX_DMA_CHANNEL};
+    static struct dma_tx_config uart2_dma_tx = {.request = kDmaRequestMuxLPUART2Tx, .channel = BSP_LPUART2_TX_DMA_CHANNEL};
     uarts[LPUART2_INDEX].dma_tx = &uart2_dma_tx;
     uarts[LPUART2_INDEX].dma_flag |= RT_DEVICE_FLAG_DMA_TX;
 #endif