diff --git a/arch/arm/src/sama5/sam_config.h b/arch/arm/src/sama5/sam_config.h
index 7d4b8a3f0d..af8ea87667 100644
--- a/arch/arm/src/sama5/sam_config.h
+++ b/arch/arm/src/sama5/sam_config.h
@@ -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
 
diff --git a/arch/arm/src/sama5/sam_serial.c b/arch/arm/src/sama5/sam_serial.c
index e7e15ab85c..5963043d8d 100644
--- a/arch/arm/src/sama5/sam_serial.c
+++ b/arch/arm/src/sama5/sam_serial.c
@@ -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,
diff --git a/arch/arm/src/sama5/sam_serialinit.c b/arch/arm/src/sama5/sam_serialinit.c
index 53b25b906b..0e2bd8eeb3 100644
--- a/arch/arm/src/sama5/sam_serialinit.c
+++ b/arch/arm/src/sama5/sam_serialinit.c
@@ -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 */