Merge pull request #3056 from niannianyouyu/master

Add UART1 driver of rv32m1_vega

4 files changed, 42 insertions, 5 deletions

diff --git a/bsp/rv32m1_vega/README.md b/bsp/rv32m1_vega/README.md
index 7179d547d3..71cb960800 100644
--- a/bsp/rv32m1_vega/README.md
+++ b/bsp/rv32m1_vega/README.md
@@ -54,7 +54,7 @@ msh />
 | 驱动 | 支持情况  |  备注  |
 | ------ | ----  | :------  |
 | UART | 支持 | UART0, RX(PTC7), TX(PTC8) |
-|  | 未支持 | UART1, RX(PTA25), TX(PTA26) |
+|      | 支持 | UART1, RX(PTA25), TX(PTA26) |
 | clock | 支持 |  |
 | GPIO | 支持（列表可能不完善，同时也需要按照使用到的IO调整pinmux、clock） |  |
 | MMC/SD | 支持 |  |
@@ -67,6 +67,8 @@ msh />
 | PTA23 | LED_GREEN |
 | PTA24 | LED_RED |
 | PTA24 | LED_STS |
+| PTA25 | UART1_RX |
+| PTA26 | UART1_TX |
 | PTE8 | BTN_SW3 |
 | PTE9 | BTN_SW4 |
 | PTE12 | BTN_SW5 |
diff --git a/bsp/rv32m1_vega/ri5cy/board/pin_mux.c b/bsp/rv32m1_vega/ri5cy/board/pin_mux.c
index d7fe15c13e..33a926d8b1 100644
--- a/bsp/rv32m1_vega/ri5cy/board/pin_mux.c
+++ b/bsp/rv32m1_vega/ri5cy/board/pin_mux.c
@@ -39,6 +39,8 @@ void BOARD_InitBootPins(void) {
 #define PIN22_IDX                       22u   /*!< Pin number for pin 22 in a port */
 #define PIN23_IDX                       23u   /*!< Pin number for pin 23 in a port */
 #define PIN24_IDX                       24u   /*!< Pin number for pin 24 in a port */
+#define PIN25_IDX                       25u   /*!< Pin number for pin 25 in a port */
+#define PIN26_IDX                       26u   /*!< Pin number for pin 26 in a port */
 #define PIN27_IDX                       27u   /*!< Pin number for pin 27 in a port */
 
 /*
@@ -48,6 +50,8 @@ BOARD_InitPins:
 - pin_list:
   - {pin_num: N2, peripheral: LPUART0, signal: RX, pin_signal: LPCMP0_IN0/PTC7/LLWU_P15/LPSPI0_PCS3/LPUART0_RX/LPI2C1_HREQ/TPM0_CH0/LPTMR1_ALT1}
   - {pin_num: P3, peripheral: LPUART0, signal: TX, pin_signal: LPCMP0_IN1/PTC8/LPSPI0_SCK/LPUART0_TX/LPI2C0_HREQ/TPM0_CH1}
+  - {pin_num: B5, peripheral: LPUART1, signal: RX, pin_signal: PTA25/LPUART1_RX/LPSPI3_SOUT/LPI2C2_SDAS/FB_AD31}
+  - {pin_num: A5, peripheral: LPUART1, signal: TX, pin_signal: PTA26/LPUART1_TX/LPSPI3_PCS2/LPI2C2_SCLS/FB_AD30}
   - {pin_num: U11, peripheral: SDHC0, signal: CMD, pin_signal: ADC0_SE12/PTD9/SDHC0_CMD/LPSPI2_SIN/LPI2C1_SCLS/TRACE_DATA0/TPM2_CH2/FXIO0_D29, slew_rate: fast, open_drain: disable,
     drive_strength: low, pull_select: up, pull_enable: enable}
   - {pin_num: P10, peripheral: SDHC0, signal: 'DATA, 0', pin_signal: ADC0_SE10/PTD7/SDHC0_D0/LPSPI2_SOUT/EMVSIM0_PD/TRACE_DATA2/TPM2_CH4/FXIO0_D27, slew_rate: fast,
@@ -87,6 +91,7 @@ void BOARD_InitPins(void) {
   PORT_SetPinConfig(PORTC, PIN27_IDX, &portc27_pinP6_config); /* PORTC27 (pin P6) is configured as PTC27 */
   PORT_SetPinMux(PORTC, PIN7_IDX, kPORT_MuxAlt3);            /* PORTC7 (pin N2) is configured as LPUART0_RX */
   PORT_SetPinMux(PORTC, PIN8_IDX, kPORT_MuxAlt3);            /* PORTC8 (pin P3) is configured as LPUART0_TX */
+
   const port_pin_config_t portd10_pinP11_config = {
     kPORT_PullUp,                                            /* Internal pull-up resistor is enabled */
     kPORT_FastSlewRate,                                      /* Fast slew rate is configured */
@@ -151,6 +156,8 @@ void BOARD_InitPins(void) {
   PORT_SetPinMux(PORTA, PIN22_IDX, kPORT_MuxAsGpio);         /* PORTA22 (pin D6) is configured as PTA24 */
   PORT_SetPinMux(PORTA, PIN23_IDX, kPORT_MuxAsGpio);         /* PORTA23 (pin D6) is configured as PTA24 */
   PORT_SetPinMux(PORTA, PIN24_IDX, kPORT_MuxAsGpio);         /* PORTA24 (pin D6) is configured as PTA24 */
+  PORT_SetPinMux(PORTA, PIN25_IDX, kPORT_MuxAlt2);            /* PORTA25 (pin B5) is configured as LPUART1_RX */
+  PORT_SetPinMux(PORTA, PIN26_IDX, kPORT_MuxAlt2);            /* PORTA26 (pin A5) is configured as LPUART1_TX */
 }
 
 /*******************************************************************************
diff --git a/bsp/rv32m1_vega/ri5cy/driver/Kconfig b/bsp/rv32m1_vega/ri5cy/driver/Kconfig
index e1ac8a91df..c8b6dfb422 100644
--- a/bsp/rv32m1_vega/ri5cy/driver/Kconfig
+++ b/bsp/rv32m1_vega/ri5cy/driver/Kconfig
@@ -1,3 +1,6 @@
 config BSP_USING_UART0
     bool "Enable UART0 (PTC7/PTC8)"
     default y
+config BSP_USING_UART1
+    bool "Enable UART1 (PTA25/PTA26)"
+    default y
diff --git a/bsp/rv32m1_vega/ri5cy/driver/drv_uart.c b/bsp/rv32m1_vega/ri5cy/driver/drv_uart.c
index 87cab6c1b3..9375c3547e 100644
--- a/bsp/rv32m1_vega/ri5cy/driver/drv_uart.c
+++ b/bsp/rv32m1_vega/ri5cy/driver/drv_uart.c
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
- * Date           Author       Notes
- * 2018/10/28     Bernard      Unify UART driver for FSL library.
+ * Date           Author            Notes
+ * 2018/10/28     Bernard           Unify UART driver for FSL library.
+ * 2019/09/07     niannianyouyu     Add the driver of UART1 
  */
 
 #include <rthw.h>
@@ -54,6 +55,15 @@ void LPUART0_IRQHandler(void)
 }
 #endif
 
+#if defined(BSP_USING_UART1)
+struct rt_serial_device serial1;
+
+void LPUART1_IRQHandler(void)
+{
+    uart_isr(&serial1);
+}
+#endif
+
 static const struct fsl_uart uarts[] =
 {
 #ifdef BSP_USING_UART0
@@ -63,9 +73,18 @@ static const struct fsl_uart uarts[] =
         &serial0,
         "uart0",
     },
+    #ifdef BSP_USING_UART1
+    {
+        LPUART1,
+        LPUART1_IRQn,
+        &serial1,
+        "uart1",
+    },
+#endif
 #endif
 };
 
+
 /*
  * UART Initiation
  */
@@ -146,8 +165,14 @@ static rt_err_t uart_configure(struct rt_serial_device *serial, struct serial_co
 
     CLOCK_SetIpSrc(kCLOCK_Lpuart0, kCLOCK_IpSrcFircAsync);
 
-    uint32_t uartClkSrcFreq = CLOCK_GetIpFreq(kCLOCK_Lpuart0);
-    LPUART_Init(uart->uart_base, &config, uartClkSrcFreq);
+    uint32_t uartClkSrcFreq0 = CLOCK_GetIpFreq(kCLOCK_Lpuart0);
+    LPUART_Init(uart->uart_base, &config, uartClkSrcFreq0);
+    LPUART_EnableInterrupts(uart->uart_base, kLPUART_RxDataRegFullInterruptEnable);
+    
+    CLOCK_SetIpSrc(kCLOCK_Lpuart1, kCLOCK_IpSrcFircAsync);
+
+    uint32_t uartClkSrcFreq1 = CLOCK_GetIpFreq(kCLOCK_Lpuart1);
+    LPUART_Init(uart->uart_base, &config, uartClkSrcFreq1);
     LPUART_EnableInterrupts(uart->uart_base, kLPUART_RxDataRegFullInterruptEnable);
 
     return RT_EOK;