michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: sam0: Fix deprecated instance macro usage

Browse source 
During conversion in #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 <hageman@inthat.cloud>
This commit is contained in:
Derek Hageman 2019-06-22 07:55:51 -06:00 • committed by Anas Nashif
commit 59786b43b3
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/dma/dma_sam0.c
View file

@ -430,16 +430,16 @@ static int dma_sam0_init(struct device *dev)
#ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_0 #ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_0
DMA_SAM0_IRQ_CONNECT(0); DMA_SAM0_IRQ_CONNECT(0);
#endif #endif
#ifdef DT_ATMEL_SAM0_DMAC_0_IRQ_1 #ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_1
DMA_SAM0_IRQ_CONNECT(1); DMA_SAM0_IRQ_CONNECT(1);
#endif #endif
#ifdef DT_ATMEL_SAM0_DMAC_0_IRQ_2 #ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_2
DMA_SAM0_IRQ_CONNECT(2); DMA_SAM0_IRQ_CONNECT(2);
#endif #endif
#ifdef DT_ATMEL_SAM0_DMAC_0_IRQ_3 #ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_3
DMA_SAM0_IRQ_CONNECT(3); DMA_SAM0_IRQ_CONNECT(3);
#endif #endif
#ifdef DT_ATMEL_SAM0_DMAC_0_IRQ_4 #ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_4
DMA_SAM0_IRQ_CONNECT(4); DMA_SAM0_IRQ_CONNECT(4);
#endif #endif

30
drivers/interrupt_controller/sam0_eic.c
View file

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