Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 09:18:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates for SAMA5D2: It has no USARTS

Browse Source
This commit is contained in:
Gregory Nutt
2015-09-10 17:15:52 -06:00
parent 2cdbc17a63
commit cf7ea3bc3e
3 changed files with 469 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/sama5/chip/sam_uart.h
+373 -231
View File
File diff suppressed because it is too large Load Diff
arch/arm/src/sama5/sam_lowputc.c
+31 -3
View File
@@ -231,70 +231,92 @@
# define SAM_CONSOLE_BAUD CONFIG_SAMA5_DBGU_BAUD
# define SAM_CONSOLE_PARITY CONFIG_SAMA5_DBGU_PARITY
# endif
# undef SAM_CONSOLE_ISUART
#elif defined(CONFIG_UART0_SERIAL_CONSOLE)
# define SAM_CONSOLE_VBASE SAM_UART0_VBASE
# define SAM_CONSOLE_BAUD CONFIG_UART0_BAUD
# define SAM_CONSOLE_BITS CONFIG_UART0_BITS
# define SAM_CONSOLE_PARITY CONFIG_UART0_PARITY
# define SAM_CONSOLE_2STOP CONFIG_UART0_2STOP
# define SAM_CONSOLE_ISUART 1
#elif defined(CONFIG_UART1_SERIAL_CONSOLE)
# define SAM_CONSOLE_VBASE SAM_UART1_VBASE
# define SAM_CONSOLE_BAUD CONFIG_UART1_BAUD
# define SAM_CONSOLE_BITS CONFIG_UART1_BITS
# define SAM_CONSOLE_PARITY CONFIG_UART1_PARITY
# define SAM_CONSOLE_2STOP CONFIG_UART1_2STOP
# define SAM_CONSOLE_ISUART 1
#elif defined(CONFIG_UART2_SERIAL_CONSOLE)
# define SAM_CONSOLE_VBASE SAM_UART2_VBASE
# define SAM_CONSOLE_BAUD CONFIG_UART2_BAUD
# define SAM_CONSOLE_BITS CONFIG_UART2_BITS
# define SAM_CONSOLE_PARITY CONFIG_UART2_PARITY
# define SAM_CONSOLE_2STOP CONFIG_UART2_2STOP
# define SAM_CONSOLE_ISUART 1
#elif defined(CONFIG_UART3_SERIAL_CONSOLE)
# define SAM_CONSOLE_VBASE SAM_UART3_VBASE
# define SAM_CONSOLE_BAUD CONFIG_UART3_BAUD
# define SAM_CONSOLE_BITS CONFIG_UART3_BITS
# define SAM_CONSOLE_PARITY CONFIG_UART3_PARITY
# define SAM_CONSOLE_2STOP CONFIG_UART3_2STOP
# define SAM_CONSOLE_ISUART 1
#elif defined(CONFIG_UART4_SERIAL_CONSOLE)
# define SAM_CONSOLE_VBASE SAM_UART4_VBASE
# define SAM_CONSOLE_BAUD CONFIG_UART4_BAUD
# define SAM_CONSOLE_BITS CONFIG_UART4_BITS
# define SAM_CONSOLE_PARITY CONFIG_UART4_PARITY
# define SAM_CONSOLE_2STOP CONFIG_UART4_2STOP
# define SAM_CONSOLE_ISUART 1
#elif defined(CONFIG_USART0_SERIAL_CONSOLE)
# define SAM_CONSOLE_VBASE SAM_USART0_VBASE
# define SAM_CONSOLE_BAUD CONFIG_USART0_BAUD
# define SAM_CONSOLE_BITS CONFIG_USART0_BITS
# define SAM_CONSOLE_PARITY CONFIG_USART0_PARITY
# define SAM_CONSOLE_2STOP CONFIG_USART0_2STOP
# undef SAM_CONSOLE_ISUART
#elif defined(CONFIG_USART1_SERIAL_CONSOLE)
# define SAM_CONSOLE_VBASE SAM_USART1_VBASE
# define SAM_CONSOLE_BAUD CONFIG_USART1_BAUD
# define SAM_CONSOLE_BITS CONFIG_USART1_BITS
# define SAM_CONSOLE_PARITY CONFIG_USART1_PARITY
# define SAM_CONSOLE_2STOP CONFIG_USART1_2STOP
# undef SAM_CONSOLE_ISUART
#elif defined(CONFIG_USART2_SERIAL_CONSOLE)
# define SAM_CONSOLE_VBASE SAM_USART2_VBASE
# define SAM_CONSOLE_BAUD CONFIG_USART2_BAUD
# define SAM_CONSOLE_BITS CONFIG_USART2_BITS
# define SAM_CONSOLE_PARITY CONFIG_USART2_PARITY
# define SAM_CONSOLE_2STOP CONFIG_USART2_2STOP
# undef SAM_CONSOLE_ISUART
#elif defined(CONFIG_USART3_SERIAL_CONSOLE)
# define SAM_CONSOLE_VBASE SAM_USART3_VBASE
# define SAM_CONSOLE_BAUD CONFIG_USART3_BAUD
# define SAM_CONSOLE_BITS CONFIG_USART3_BITS
# define SAM_CONSOLE_PARITY CONFIG_USART3_PARITY
# define SAM_CONSOLE_2STOP CONFIG_USART3_2STOP
# undef SAM_CONSOLE_ISUART
#else
# error "No CONFIG_U[S]ARTn_SERIAL_CONSOLE Setting"
#endif
/* Select the settings for the mode register */
#if defined(SAM_CONSOLE_ISUART)
# if SAM_CONSOLE_BITS == 8 && SAM_CONSOLE_PARITY == 0
# elif SAM_CONSOLE_BITS == 7 && SAM_CONSOLE_PARITY != 0
# else
# error "Unsupported combination of bits and parity in UART console"
# endif
# if SAM_CONSOLE_2STOP != 0
# error "Unsupported number of stop bits and parity for UART console"
# endif
#endif
#if SAM_CONSOLE_BITS == 5
# define MR_CHRL_VALUE UART_MR_CHRL_5BITS /* 5 bits */
#elif SAM_CONSOLE_BITS == 6
# define MR_CHRL_VALUE UART_MR_CHRL_6BITS /* 6 bits */
# define MR_CHRL_VALUE UART_MR_CHRL_6BITS /* 6 bits */
#elif SAM_CONSOLE_BITS == 7
# define MR_CHRL_VALUE UART_MR_CHRL_7BITS /* 7 bits */
#elif SAM_CONSOLE_BITS == 8
@@ -320,8 +342,14 @@
# define MR_NBSTOP_VALUE UART_MR_NBSTOP_1
#endif
#define MR_VALUE (UART_MR_MODE_NORMAL | SAM_MR_USCLKS | \
MR_CHRL_VALUE | MR_PAR_VALUE | MR_NBSTOP_VALUE)
#if defined(ATSAMA5D2)
# define MR_VALUE (MR_PAR_VALUE | UART_MR_PERIPHCLK | \
UART_MR_CHMODE_NORMAL)
#elif defined(ATSAMA5D3) ||defined(ATSAMA5D4)
# define MR_VALUE (UART_MR_MODE_NORMAL | SAM_MR_USCLKS | \
MR_CHRL_VALUE | MR_PAR_VALUE | MR_NBSTOP_VALUE | \
UART_MR_CHMODE_NORMAL)
#endif
/**************************************************************************
* Private Types
arch/arm/src/sama5/sam_serial.c
+65 -2
View File
@@ -697,6 +697,16 @@ static char g_usart4txbuffer[CONFIG_USART4_TXBUFSIZE];
/* This describes the state of the UART0 port. */
#ifdef CONFIG_SAMA5_UART0
# if CONFIG_UART0_BITS == 8 && CONFIG_UART0_PARITY == 0
# elif CONFIG_UART0_BITS == 7 && CONFIG_UART0_PARITY != 0
# else
# error "Unsupported combination of bits and parity for UART0"
# endif
# if CONFIG_UART0_2STOP != 0
# error "Unsupported number of stop bits and parity for UART0"
# endif
static struct up_dev_s g_uart0priv =
{
.usartbase = SAM_UART0_VBASE,
@@ -727,6 +737,16 @@ static uart_dev_t g_uart0port =
/* This describes the state of the UART1 port. */
#ifdef CONFIG_SAMA5_UART1
# if CONFIG_UART1_BITS == 8 && CONFIG_UART1_PARITY == 0
# elif CONFIG_UART1_BITS == 7 && CONFIG_UART1_PARITY != 0
# else
# error "Unsupported combination of bits and parity for UART1"
# endif
# if CONFIG_UART1_2STOP != 0
# error "Unsupported number of stop bits and parity for UART1"
# endif
static struct up_dev_s g_uart1priv =
{
.usartbase = SAM_UART1_VBASE,
@@ -757,6 +777,16 @@ static uart_dev_t g_uart1port =
/* This describes the state of the UART2 port. */
#ifdef CONFIG_SAMA5_UART2
# if CONFIG_UART2_BITS == 8 && CONFIG_UART2_PARITY == 0
# elif CONFIG_UART2_BITS == 7 && CONFIG_UART2_PARITY != 0
# else
# error "Unsupported combination of bits and parity for UART2"
# endif
# if CONFIG_UART2_2STOP != 0
# error "Unsupported number of stop bits and parity for UART2"
# endif
static struct up_dev_s g_uart2priv =
{
.usartbase = SAM_UART2_VBASE,
@@ -787,6 +817,16 @@ static uart_dev_t g_uart2port =
/* This describes the state of the UART3 port. */
#ifdef CONFIG_SAMA5_UART3
# if CONFIG_UART3_BITS == 8 && CONFIG_UART3_PARITY == 0
# elif CONFIG_UART3_BITS == 7 && CONFIG_UART3_PARITY != 0
# else
# error "Unsupported combination of bits and parity for UART3"
# endif
# if CONFIG_UART3_2STOP != 0
# error "Unsupported number of stop bits and parity for UART3"
# endif
static struct up_dev_s g_uart3priv =
{
.usartbase = SAM_UART3_VBASE,
@@ -817,6 +857,16 @@ static uart_dev_t g_uart3port =
/* This describes the state of the UART4 port. */
#ifdef CONFIG_SAMA5_UART4
# if CONFIG_UART4_BITS == 8 && CONFIG_UART4_PARITY == 0
# elif CONFIG_UART4_BITS == 7 && CONFIG_UART4_PARITY != 0
# else
# error "Unsupported combination of bits and parity for UART4"
# endif
# if CONFIG_UART4_2STOP != 0
# error "Unsupported number of stop bits and parity for UART4"
# endif
static struct up_dev_s g_uart4priv =
{
.usartbase = SAM_UART4_VBASE,
@@ -1101,18 +1151,28 @@ static int up_setup(struct uart_dev_s *dev)
{
/* Enable hardware flow control and MCK as the timing source */
regval = (UART_MR_MODE_HWHS | SAM_MR_USCLKS);
regval = (UART_MR_MODE_HWHS | SAM_MR_USCLKS | UART_MR_CHMODE_NORMAL);
}
else
#endif
{
#if defined(ATSAMA5D2)
/* Set up the mode register. Start with normal UART mode and the
* peripheral clock as the timing source
*/
regval = (UART_MR_PERIPHCLK | UART_MR_CHMODE_NORMAL);
#elif defined(ATSAMA5D3) || defined(ATSAMA5D4)
/* Set up the mode register. Start with normal UART mode and the MCK
* as the timing source
*/
regval = (UART_MR_MODE_NORMAL | SAM_MR_USCLKS);
regval = (UART_MR_MODE_NORMAL | SAM_MR_USCLKS | UART_MR_CHMODE_NORMAL);
#endif
}
#if defined(ATSAMA5D3) || defined(ATSAMA5D4)
/* OR in settings for the selected number of bits */
if (priv->bits == 5)
@@ -1153,6 +1213,7 @@ static int up_setup(struct uart_dev_s *dev)
{
regval |= UART_MR_CHRL_8BITS; /* 8 bits (default) */
}
#endif /* ATSAMA5D3 || ATSAMA5D4 */
/* OR in settings for the selected parity */
@@ -1169,6 +1230,7 @@ static int up_setup(struct uart_dev_s *dev)
regval |= UART_MR_PAR_NONE;
}
#if defined(ATSAMA5D3) || defined(ATSAMA5D4)
/* OR in settings for the number of stop bits */
if (priv->stopbits2)
@@ -1179,6 +1241,7 @@ static int up_setup(struct uart_dev_s *dev)
{
regval |= UART_MR_NBSTOP_1;
}
#endif /* ATSAMA5D3 || ATSAMA5D4 */
/* And save the new mode register value */