sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMA5: Fix some SAMA5D3/4 bugs introduced with the SAMA5D2 changes

Browse Source
This commit is contained in:
Gregory Nutt 2015-09-29 16:10:10 -06:00
parent be3adb678e
commit 7fa4e4daab
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/src/sama5/sam_config.h
View File

@ -73,7 +73,7 @@
# undef CONFIG_USART3_SERIAL_CONSOLE
#endif
#ifndef CONFIG_USART4_ISUART
# undef CONFIG_SAMA4_USART4
# undef CONFIG_SAMA5_USART4
# undef CONFIG_SAMA5_FLEXCOM4_USART
# undef CONFIG_USART4_SERIAL_CONSOLE
#endif
@ -86,9 +86,9 @@
# define SAMA5_HAVE_UART
#endif
#if defined(CONFIG_SAMA0_USART4) || defined(CONFIG_SAMA1_USART4) || \
defined(CONFIG_SAMA2_USART4) || defined(CONFIG_SAMA3_USART4) || \
defined(CONFIG_SAMA4_USART4)
#if defined(CONFIG_SAMA5_USART0) || defined(CONFIG_SAMA5_USART1) || \
defined(CONFIG_SAMA5_USART2) || defined(CONFIG_SAMA5_USART3) || \
defined(CONFIG_SAMA5_USART4)
# define SAMA5_HAVE_USART
#endif

2
arch/arm/src/sama5/sam_serial.c
View File

@ -892,7 +892,7 @@ static uart_dev_t g_usart3port =
#ifdef CONFIG_USART4_ISUART
static struct up_dev_s g_usart4priv =
{
.handler = up_uart4_interrupt,
.handler = up_usart4_interrupt,
.usartbase = SAM_USART4_VBASE,
.baud = CONFIG_USART4_BAUD,
.irq = SAM_IRQ_USART4,

6
arch/arm/src/sama5/sam_serialinit.c
View File

@ -68,7 +68,7 @@ void sam_earlyserialinit(void)
#if defined(SAMA5_HAVE_UART) || defined(SAMA5_HAVE_USART)
/* Initialize UART/USART drivers */
uart_serialinit();
uart_earlyserialinit();
#endif
#ifdef SAMA5_HAVE_FLEXCOM_USART
@ -96,9 +96,9 @@ void up_serialinit(void)
#endif
#ifdef SAMA5_HAVE_FLEXCOM_USART
/* Register Flexcom USARTs */
/* Register Flexcom USART drivers */
flexus_earlyserialinit();
flexus_serialinit();
#endif
/* Register the DBGU as well */