diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c
index 3b0234d44b..9cf4a6c02f 100644
--- a/arch/arm/src/sama5/sam_dmac.c
+++ b/arch/arm/src/sama5/sam_dmac.c
@@ -1426,7 +1426,7 @@ sam_allocdesc(struct sam_dmach_s *dmach, struct dma_linklist_s *prev,
                    * via AHB IF0.
                    */
 
-                  prev->dscr = (uint32_t)sam_physramaddr((uintptr_t)descr);
+                  prev->dscr = (uint32_t)sam_physramaddr((uintptr_t)desc);
                 }
 
               /* In any event, this is the new tail of the list.  The source
diff --git a/arch/arm/src/sama5/sam_pio.c b/arch/arm/src/sama5/sam_pio.c
index eb280cc2e8..1048bc278a 100644
--- a/arch/arm/src/sama5/sam_pio.c
+++ b/arch/arm/src/sama5/sam_pio.c
@@ -245,7 +245,7 @@ static void sam_pio_disableclk(pio_pinset_t cfgset)
     {
       /* Get the base address of the PIO port */
 
-      base = g_piobase[port];
+      base = sam_pion_vbase(port);
 
       /* Are any pins configured as PIO inputs?
        *
diff --git a/arch/arm/src/sama5/sam_pioirq.c b/arch/arm/src/sama5/sam_pioirq.c
index 019b9f6b13..649f1736a2 100644
--- a/arch/arm/src/sama5/sam_pioirq.c
+++ b/arch/arm/src/sama5/sam_pioirq.c
@@ -53,11 +53,12 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "sam_pio.h"
-#include "sam_periphclks.h"
 #include "chip/sam_pio.h"
 #include "chip/sam_pmc.h"
 
+#include "sam_pio.h"
+#include "sam_periphclks.h"
+
 #ifdef CONFIG_SAMA5_PIO_IRQ
 
 /****************************************************************************