From e401a44805be1b8f8525eca3eeb957aeffc9c22b Mon Sep 17 00:00:00 2001
From: Lee Lup Yuen <luppy@appkaki.com>
Date: Thu, 11 May 2023 15:31:07 +0800
Subject: [PATCH] Update UART

---
 README.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c10d99f..67a45ad 100644
--- a/README.md
+++ b/README.md
@@ -1105,15 +1105,15 @@ FYI: How `printf` works...
 
 To support multiple UART Ports, we copied the following functions from the [Allwinner A1X UART Driver](https://github.com/apache/nuttx/blob/master/arch/arm/src/a1x/a1x_serial.c#L695-L987)...
 
-- [`up_setup`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/525ae7c40f9258e31771a463d1f4ca1258e0db8e/arch/arm64/src/a64/a64_serial.c#L406-L537)
+- [`arm64_earlyserialinit`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/uart3/arch/arm64/src/a64/a64_serial.c#L1323-L1398)
 
-- [`a64_uart_irq_handler`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/525ae7c40f9258e31771a463d1f4ca1258e0db8e/arch/arm64/src/a64/a64_serial.c#L294-L404)
+- [`a64_uart_init`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/uart3/arch/arm64/src/a64/a64_serial.c#L944-L996)
 
-- [`a64_uart_receive`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/525ae7c40f9258e31771a463d1f4ca1258e0db8e/arch/arm64/src/a64/a64_serial.c#L705-L731)
+- [`a64_uart_setup`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/uart3/arch/arm64/src/a64/a64_serial.c#L453-L582)
 
-We modified [`a64_uart_setup`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/525ae7c40f9258e31771a463d1f4ca1258e0db8e/arch/arm64/src/a64/a64_serial.c#L539-L560) to call [`up_setup`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/525ae7c40f9258e31771a463d1f4ca1258e0db8e/arch/arm64/src/a64/a64_serial.c#L406-L537).
+- [`a64_uart_irq_handler`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/uart3/arch/arm64/src/a64/a64_serial.c#L301-L415)
 
-We register UART3 as `/dev/ttyS1` in [`arm64_serialinit`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/525ae7c40f9258e31771a463d1f4ca1258e0db8e/arch/arm64/src/a64/a64_serial.c#L1150-L1217).
+- [`a64_uart_receive`](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/uart3/arch/arm64/src/a64/a64_serial.c#L727-L753)
 
 [(Here's the log)](https://github.com/lupyuen2/wip-pinephone-nuttx-apps/blob/e5aa2baba64c8d904d6c16b7c5dbc68cd5c8f1e1/examples/hello/hello_main.c#L72-L270)
 
@@ -1121,7 +1121,7 @@ Inside the UART Driver, be careful when logging to the UART Port! If the UART Po
 
 > "This register may only be accessed when the DLAB bit (UART_LCR[7]) is set and the UART is not busy (UART_USR[0] is zero)"
 
-That's why we always wait for UART Not Busy before setting the Baud Rate. [(Like this)](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/525ae7c40f9258e31771a463d1f4ca1258e0db8e/arch/arm64/src/a64/a64_serial.c#L486-L500)
+That's why we always wait for UART Not Busy before setting the Baud Rate. [(Like this)](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/uart3/arch/arm64/src/a64/a64_serial.c#L417-L451)
 
 _What happens if UART Is Busy when we set the Baud Rate?_
 
@@ -1155,7 +1155,11 @@ up_serialout: addr=0x1c2800c, before=0x3, after=0x3
 // Before should be 0x83, not 0x3
 ```
 
-We fix this by disabling the logging and waiting for UART Not Busy before setting the Baud Rate. [(Like this)](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/525ae7c40f9258e31771a463d1f4ca1258e0db8e/arch/arm64/src/a64/a64_serial.c#L486-L500)
+We fix this by disabling the logging and waiting for UART Not Busy before setting the Baud Rate. [(Like this)](https://github.com/lupyuen2/wip-pinephone-nuttx/blob/uart3/arch/arm64/src/a64/a64_serial.c#L530-L549)
+
+The changes have been upstreamed to NuttX Mainline...
+
+-   [__Pull Request: Support multiple UART Ports__](https://github.com/apache/nuttx/pull/9243)
 
 Let's test the PinePhone LTE Modem on UART3...