diff --git a/arch/arm/src/samd2l2/adc.h b/arch/arm/include/samd2l2/sam_adc.h
similarity index 94%
rename from arch/arm/src/samd2l2/adc.h
rename to arch/arm/include/samd2l2/sam_adc.h
index c7c7880ee8..ffc051919c 100644
--- a/arch/arm/src/samd2l2/adc.h
+++ b/arch/arm/include/samd2l2/sam_adc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/samd2l2/adc.h
+ * arch/arm/src/samd2l2/sam_adc.h
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMD2L2_ADC_H
-#define __ARCH_ARM_SRC_SAMD2L2_ADC_H
+#ifndef __ARCH_ARM_SRC_SAMD2L2_SAM_ADC_H
+#define __ARCH_ARM_SRC_SAMD2L2_SAM_ADC_H
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -58,4 +58,4 @@ struct sam_adc_param_s
   uint8_t averaging;    /* number of samples to be collected */
 };
 
-#endif /* __ARCH_ARM_SRC_SAMD2L2_ADC_H */
+#endif /* __ARCH_ARM_SRC_SAMD2L2_SAM_ADC_H */
diff --git a/arch/arm/src/samd2l2/sam_adc.c b/arch/arm/src/samd2l2/sam_adc.c
index 99ad3c0717..bf626fd5c5 100644
--- a/arch/arm/src/samd2l2/sam_adc.c
+++ b/arch/arm/src/samd2l2/sam_adc.c
@@ -57,10 +57,9 @@
 #include <nuttx/analog/adc.h>
 #include <nuttx/kmalloc.h>
 
-#include <arch/board/board.h>
+#include <arch/chip/sam_adc.h>
 
 #include "up_arch.h"
-#include "adc.h"
 #include "sam_adc.h"
 #include "sam_pinmap.h"
 #include "sam_gclk.h"
@@ -68,6 +67,8 @@
 #include "sam_fuses.h"
 #include "samd_periphclks.h"
 
+#include <arch/board/board.h>
+
 /****************************************************************************
  * Private Function Prototypes
  ****************************************************************************/