drivers: sam0: Fix deprecated instance macro usage

During conversion in zephyrproject-rtos#16815 a few device tree instance macro aliases where missed (probably due to them existing to support future SoCs and so not currently compiled), this fixes their usage. Signed-off-by: Derek Hageman <[email protected]>
dagar · Jun 24, 2019 · 59786b4 · 59786b4
1 parent 4c27e5b
commit 59786b4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/drivers/dma/dma_sam0.c b/drivers/dma/dma_sam0.c
@@ -430,16 +430,16 @@ static int dma_sam0_init(struct device *dev)
 #ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_0
 	DMA_SAM0_IRQ_CONNECT(0);
 #endif
-#ifdef DT_ATMEL_SAM0_DMAC_0_IRQ_1
+#ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_1
 	DMA_SAM0_IRQ_CONNECT(1);
 #endif
-#ifdef DT_ATMEL_SAM0_DMAC_0_IRQ_2
+#ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_2
 	DMA_SAM0_IRQ_CONNECT(2);
 #endif
-#ifdef DT_ATMEL_SAM0_DMAC_0_IRQ_3
+#ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_3
 	DMA_SAM0_IRQ_CONNECT(3);
 #endif
-#ifdef DT_ATMEL_SAM0_DMAC_0_IRQ_4
+#ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_4
 	DMA_SAM0_IRQ_CONNECT(4);
 #endif
 

diff --git a/drivers/interrupt_controller/sam0_eic.c b/drivers/interrupt_controller/sam0_eic.c
@@ -336,49 +336,49 @@ static int sam0_eic_init(struct device *dev)
 #ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_0
 	SAM0_EIC_IRQ_CONNECT(0);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_1
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_1
 	SAM0_EIC_IRQ_CONNECT(1);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_2
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_2
 	SAM0_EIC_IRQ_CONNECT(2);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_3
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_3
 	SAM0_EIC_IRQ_CONNECT(3);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_4
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_4
 	SAM0_EIC_IRQ_CONNECT(4);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_5
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_5
 	SAM0_EIC_IRQ_CONNECT(5);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_6
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_6
 	SAM0_EIC_IRQ_CONNECT(6);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_7
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_7
 	SAM0_EIC_IRQ_CONNECT(7);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_8
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_8
 	SAM0_EIC_IRQ_CONNECT(8);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_9
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_9
 	SAM0_EIC_IRQ_CONNECT(9);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_10
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_10
 	SAM0_EIC_IRQ_CONNECT(10);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_11
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_11
 	SAM0_EIC_IRQ_CONNECT(11);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_12
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_12
 	SAM0_EIC_IRQ_CONNECT(12);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_13
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_13
 	SAM0_EIC_IRQ_CONNECT(13);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_14
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_14
 	SAM0_EIC_IRQ_CONNECT(14);
 #endif
-#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_15
+#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_15
 	SAM0_EIC_IRQ_CONNECT(15);
 #endif