diff --git a/arch/arm/src/armv7-a/arm_addrenv.c b/arch/arm/src/armv7-a/arm_addrenv.c
index f327a5fd929..64828a28c88 100644
--- a/arch/arm/src/armv7-a/arm_addrenv.c
+++ b/arch/arm/src/armv7-a/arm_addrenv.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/armv7/arm_addrenv.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014, 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -116,9 +116,11 @@
 #include <nuttx/arch.h>
 #include <nuttx/pgalloc.h>
 #include <nuttx/irq.h>
+#include <nuttx/cache.h>
 
 #include "pgalloc.h"
 #include "mmu.h"
+#include "cp15_cacheops.h"
 #include "addrenv.h"
 
 #ifdef CONFIG_ARCH_ADDRENV
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index c866cd10527..9da06dff634 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/sama5/sam_ehci.c
  *
- *   Copyright (C) 2013, 2016-2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2016-2017, 2019 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,6 +53,7 @@
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/semaphore.h>
+#include <nuttx/cache.h>
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/usbhost.h>
 #include <nuttx/usb/ehci.h>
@@ -72,7 +73,9 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
-/* Configuration ***************************************************************/
+ 
+/* Configuration ************************************************************/
+
 /* Pre-requisites */
 
 #if !defined(CONFIG_SCHED_WORKQUEUE)
@@ -133,7 +136,7 @@
 
 #undef CONFIG_SAMA5_UHPHS_RHPORT1
 
-/* Driver-private Definitions **************************************************/
+/* Driver-private Definitions ************************************************/
 
 /* This is the set of interrupts handled by this driver */
 
@@ -2763,7 +2766,7 @@ static int sam_qh_cancel(struct sam_qh_s *qh, uint32_t **bp, void *arg)
    */
 
   **bp = qh->hw.hlp;
-  cp15_flush_dcache((uintptr_t)*bp, (uintptr_t)*bp + sizeof(uint32_t));
+  up_flush_dcache((uintptr_t)*bp, (uintptr_t)*bp + sizeof(uint32_t));
 
   /* Re-enable the schedules (if they were enabled before. */
 
diff --git a/configs/sama5d3x-ek/src/nor_main.c b/configs/sama5d3x-ek/src/nor_main.c
index ef5c1960df6..14c86e787ea 100644
--- a/configs/sama5d3x-ek/src/nor_main.c
+++ b/configs/sama5d3x-ek/src/nor_main.c
@@ -180,7 +180,8 @@ int nor_main(int argc, char *argv)
    */
 
   cp15_disable_mmu();
-  cp15_disable_caches();
+  up_disable_icache();
+  up_disable_dcache();
 
   /* Invalidate caches and TLBs */
 
diff --git a/configs/sama5d4-ek/src/dram_main.c b/configs/sama5d4-ek/src/dram_main.c
index 00267a104e7..1b1073f6913 100644
--- a/configs/sama5d4-ek/src/dram_main.c
+++ b/configs/sama5d4-ek/src/dram_main.c
@@ -161,7 +161,8 @@ int dram_main(int argc, char *argv)
    */
 
   cp15_disable_mmu();
-  cp15_disable_caches();
+  up_disable_icache();
+  up_disable_dcache();
 
   /* Invalidate caches and TLBs */