Skip to content

sama3 sam_serial.c USART selection fixes #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patacongo merged 8 commits into from
Dec 31, 2019
Merged

sama3 sam_serial.c USART selection fixes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e89db77
fix uart2port in sam_serial
starcatio Dec 28, 2019
f4a99ee
fix the rest of the uarts in sam_serial
starcatio Dec 28, 2019
716100c
fix some minor typos
starcatio Dec 28, 2019
e83f784
fix typo
starcatio Dec 28, 2019
9b38412
updating pinmap with default UARTn_RXD, _TXD
starcatio Dec 28, 2019
5df08ca
moving UART pin disambiguation to board.h
starcatio Dec 28, 2019
dbc2d54
fixing typo in USART pin docs
starcatio Dec 28, 2019
076e6ab
clarified UART pin function in comments
starcatio Dec 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions arch/arm/src/sama5/sam_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,16 @@
# define TTYS0_DEV g_uart1port /* UART1 is ttyS0 */
# define UART1_ASSIGNED 1
#elif defined(CONFIG_UART2_SERIAL_CONSOLE)
# define CONSOLE_DEV g_uart1port /* UART2 is console */
# define TTYS0_DEV g_uart1port /* UART2 is ttyS0 */
# define CONSOLE_DEV g_uart2port /* UART2 is console */
# define TTYS0_DEV g_uart2port /* UART2 is ttyS0 */
# define UART2_ASSIGNED 1
#elif defined(CONFIG_UART3_SERIAL_CONSOLE)
# define CONSOLE_DEV g_uart1port /* UART3 is console */
# define TTYS0_DEV g_uart1port /* UART3 is ttyS0 */
# define CONSOLE_DEV g_uart3port /* UART3 is console */
# define TTYS0_DEV g_uart3port /* UART3 is ttyS0 */
# define UART3_ASSIGNED 1
#elif defined(CONFIG_UART4_SERIAL_CONSOLE)
# define CONSOLE_DEV g_uart1port /* UART4 is console */
# define TTYS0_DEV g_uart1port /* UART4 is ttyS0 */
# define CONSOLE_DEV g_uart4port /* UART4 is console */
# define TTYS0_DEV g_uart4port /* UART4 is ttyS0 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_USART0_SERIAL_CONSOLE)
# define CONSOLE_DEV g_usart0port /* USART0 is console */
Expand Down Expand Up @@ -159,13 +159,13 @@
# define TTYS0_DEV g_uart1port /* UART1 is ttyS0 */
# define UART1_ASSIGNED 1
# elif defined(CONFIG_SAMA5_UART2)
# define TTYS0_DEV g_uart1port /* UART2 is ttyS0 */
# define TTYS0_DEV g_uart2port /* UART2 is ttyS0 */
# define UART2_ASSIGNED 1
# elif defined(CONFIG_SAMA5_UART3)
# define TTYS0_DEV g_uart1port /* UART3 is ttyS0 */
# define TTYS0_DEV g_uart3port /* UART3 is ttyS0 */
# define UART3_ASSIGNED 1
# elif defined(CONFIG_SAMA5_UART4)
# define TTYS0_DEV g_uart1port /* UART4 is ttyS0 */
# define TTYS0_DEV g_uart4port /* UART4 is ttyS0 */
# define UART4_ASSIGNED 1
# elif defined(CONFIG_USART0_SERIALDRIVER)
# define TTYS0_DEV g_usart0port /* USART0 is ttyS0 */
Expand Down Expand Up @@ -194,13 +194,13 @@
# define TTYS1_DEV g_uart1port /* UART1 is ttyS1 */
# define UART1_ASSIGNED 1
#elif defined(CONFIG_SAMA5_UART2) && !defined(UART2_ASSIGNED)
# define TTYS1_DEV g_uart1port /* UART2 is ttyS1 */
# define TTYS1_DEV g_uart2port /* UART2 is ttyS1 */
# define UART2_ASSIGNED 1
#elif defined(CONFIG_SAMA5_UART3) && !defined(UART3_ASSIGNED)
# define TTYS1_DEV g_uart1port /* UART3 is ttyS1 */
# define TTYS1_DEV g_uart3port /* UART3 is ttyS1 */
# define UART3_ASSIGNED 1
#elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
# define TTYS1_DEV g_uart1port /* UART4 is ttyS1 */
# define TTYS1_DEV g_uart4port /* UART4 is ttyS1 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
# define TTYS1_DEV g_usart0port /* USART0 is ttyS1 */
Expand Down Expand Up @@ -228,13 +228,13 @@
# define TTYS2_DEV g_uart1port /* UART1 is ttyS2 */
# define UART1_ASSIGNED 1
#elif defined(CONFIG_SAMA5_UART2) && !defined(UART2_ASSIGNED)
# define TTYS2_DEV g_uart1port /* UART2 is ttyS2 */
# define TTYS2_DEV g_uart2port /* UART2 is ttyS2 */
# define UART2_ASSIGNED 1
#elif defined(CONFIG_SAMA5_UART3) && !defined(UART3_ASSIGNED)
# define TTYS2_DEV g_uart1port /* UART3 is ttyS2 */
# define TTYS2_DEV g_uart2port /* UART3 is ttyS2 */
# define UART3_ASSIGNED 1
#elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
# define TTYS2_DEV g_uart1port /* UART4 is ttyS2 */
# define TTYS2_DEV g_uart4port /* UART4 is ttyS2 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
# define TTYS2_DEV g_usart0port /* USART0 is ttyS2 */
Expand All @@ -259,10 +259,10 @@
*/

#if defined(CONFIG_SAMA5_UART2) && !defined(UART2_ASSIGNED)
# define TTYS3_DEV g_uart1port /* UART2 is ttyS3 */
# define TTYS3_DEV g_uart2port /* UART2 is ttyS3 */
# define UART2_ASSIGNED 1
#elif defined(CONFIG_SAMA5_UART3) && !defined(UART3_ASSIGNED)
# define TTYS3_DEV g_uart1port /* UART3 is ttyS3 */
# define TTYS3_DEV g_uart3port /* UART3 is ttyS3 */
# define UART3_ASSIGNED 1
#elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
# define TTYS3_DEV g_uart1port /* UART4 is ttyS3 */
Expand Down Expand Up @@ -290,10 +290,10 @@
*/

#if defined(CONFIG_SAMA5_UART3) && !defined(UART3_ASSIGNED)
# define TTYS4_DEV g_uart1port /* UART3 is ttyS4 */
# define TTYS4_DEV g_uart3port /* UART3 is ttyS4 */
# define UART3_ASSIGNED 1
#elif defined(CONFIG_SAMA5_UART4) && !defined(UART4_ASSIGNED)
# define TTYS4_DEV g_uart1port /* UART4 is ttyS4 */
# define TTYS4_DEV g_uart4port /* UART4 is ttyS4 */
# define UART4_ASSIGNED 1
#elif defined(CONFIG_USART0_SERIALDRIVER) && !defined(USART0_ASSIGNED)
# define TTYS4_DEV g_usart0port /* USART0 is ttyS4 */
Expand Down
6 changes: 3 additions & 3 deletions boards/arm/sama5/sama5d2-xult/README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ DRAMBOOT, AT25BOOT, SRAMBOOT

The boards/arm/sama5/sama5d4-xult/README.txt also describes variants AT25BOOT and
SRAMBOOT. This have not yet been ported to the SAMA5D2-XULT, but are
available if they are usefult too you.
available if they are useful too you.

Running NuttX from SDRAM
========================
Expand Down Expand Up @@ -203,7 +203,7 @@ REVISIT: Unverified, cloned text from the SAMA5D4-EK README.txt

http://www.at91.com/linux4sam/bin/view/Linux4SAM/U-Boot#Build_U_Boot_from_sources

A pre-Built binay image is available here:
A pre-Built binary image is available here:

ftp://www.at91.com/pub/uboot/u-boot-v2013.07/u-boot-sama5d3_xplained-v2013.07-at91-r1.bin

Expand Down Expand Up @@ -237,7 +237,7 @@ REVISIT: Unverified, cloned text from the SAMA5D4-EK README.txt
- Press the "Send File" button
- Close SAM-BA, remove the USB Device cable.

You should now be able to interrupt with U-Boot vie the DBGU interface.
You should now be able to interrupt with U-Boot via the DBGU interface.

Load NuttX with U-Boot on AT91 boards
-------------------------------------
Expand Down
28 changes: 28 additions & 0 deletions boards/arm/sama5/sama5d2-xult/include/board.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,34 @@
#define PIO_UART1_RXD PIO_UART1_RXD_1
#define PIO_UART1_TXD PIO_UART1_TXD_1

/* Standard UART on Arduino connector (J22) is UART2.
*
* ---- ------- -------------
* J22 BOARD SAMA5D2
* PIN NAME PIO FUNCTION
* ---- ------- -------------
* 7 URXD2 PD4 UART2 URXD2
* 8 UTXD2 PD5 UART2 UTXD2
* ---- ------- -------------
*/

#define PIO_UART2_RXD PIO_UART2_RXD_2
#define PIO_UART2_TXD PIO_UART2_TXD_2

/* Standard UART on Arduino connector (J17) is UART3.
*
* ---- ------- -------------
* J17 BOARD SAMA5D2
* PIN NAME PIO FUNCTION
* ---- ------- -------------
* 27 URXD3 PB11 UART3 URXD3
* 28 UTXD3 PB12 UART3 UTXD3
* ---- ------- -------------
*/

#define PIO_UART3_RXD PIO_UART3_RXD_1
#define PIO_UART3_TXD PIO_UART3_TXD_1

/* Standard UART on Arduino connector (J21) is FLEXCOM4.
*
* ---- ------- -------------
Expand Down