diff --git a/arch/arm/src/samd2l2/sam_dmac.c b/arch/arm/src/samd2l2/sam_dmac.c
index 1e41f6dff0..51f773f4da 100644
--- a/arch/arm/src/samd2l2/sam_dmac.c
+++ b/arch/arm/src/samd2l2/sam_dmac.c
@@ -137,9 +137,9 @@ static struct sam_dmach_s g_dmach[SAMD2L2_NDMACHAN];
  */
 
 static struct dma_desc_s g_base_desc[SAMD2L2_NDMACHAN]
-  locate_data(".lpram"), aligned(16);
+  locate_data(".lpram") aligned_data(16);
 static struct dma_desc_s g_writeback_desc[SAMD2L2_NDMACHAN]
-  locate_data(".lpram"), aligned(16);
+  locate_data(".lpram") aligned_data(16);
 
 #if CONFIG_SAMD2L2_DMAC_NDESC > 0
 /* Additional DMA descriptors for (optional) multi-block transfer support.
@@ -147,7 +147,7 @@ static struct dma_desc_s g_writeback_desc[SAMD2L2_NDMACHAN]
  */
 
 static struct dma_desc_s g_dma_desc[CONFIG_SAMD2L2_DMAC_NDESC]
-  locate_data(".lpram"), aligned(16);
+  locate_data(".lpram") aligned_data(16);
 #endif
 
 /****************************************************************************
@@ -178,7 +178,7 @@ static void sam_dmaterminate(struct sam_dmach_s *dmach, int result)
 
   /* Disable all channel interrupts */
 
-  putreg8(1 << dmach->dc_chan, SAM_DMAC_CHINTENCLR);
+  putreg8(DMAC_INT_ALL, SAM_DMAC_CHINTENCLR);
   leave_critical_section(flags);
 
   /* Free the DMA descriptor list */
@@ -833,7 +833,7 @@ DMA_HANDLE sam_dmachannel(uint32_t chflags)
 
           /* Disable all channel interrupts */
 
-          putreg8(1 << chndx, SAM_DMAC_CHINTENCLR);
+          putreg8(DMAC_INT_ALL, SAM_DMAC_CHINTENCLR);
           leave_critical_section(flags);
           break;
         }
diff --git a/arch/arm/src/samd2l2/sam_dmac.h b/arch/arm/src/samd2l2/sam_dmac.h
index e2fb884635..fdbd9cf009 100644
--- a/arch/arm/src/samd2l2/sam_dmac.h
+++ b/arch/arm/src/samd2l2/sam_dmac.h
@@ -31,8 +31,6 @@
 
 #include "chip.h"
 
-#include "hardware/sam_dmac.h"
-
 #ifdef CONFIG_SAMD2L2_DMAC
 
 #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21)