diff --git a/soc/arc/snps_emsk/dts_fixup.h b/soc/arc/snps_emsk/dts_fixup.h index 61726c96604..173325e8e25 100644 --- a/soc/arc/snps_emsk/dts_fixup.h +++ b/soc/arc/snps_emsk/dts_fixup.h @@ -3,11 +3,11 @@ /* SoC level DTS fixup file */ /* CCM configuration */ -#define DT_DCCM_BASE_ADDRESS DT_INST_0_ARC_DCCM_BASE_ADDRESS -#define DT_DCCM_SIZE (DT_INST_0_ARC_DCCM_SIZE >> 10) +#define DT_DCCM_BASE_ADDRESS DT_REG_ADDR(DT_INST(0, arc_dccm)) +#define DT_DCCM_SIZE (DT_REG_SIZE(DT_INST(0, arc_dccm)) >> 10) -#define DT_ICCM_BASE_ADDRESS DT_INST_0_ARC_ICCM_BASE_ADDRESS -#define DT_ICCM_SIZE (DT_INST_0_ARC_ICCM_SIZE >> 10) +#define DT_ICCM_BASE_ADDRESS DT_REG_ADDR(DT_INST(0, arc_iccm)) +#define DT_ICCM_SIZE (DT_REG_SIZE(DT_INST(0, arc_iccm)) >> 10) #define DT_DDR_BASE_ADDRESS DT_MMIO_SRAM_10000000_BASE_ADDRESS #define DT_DDR_SIZE (DT_MMIO_SRAM_10000000_SIZE >> 10) diff --git a/soc/arc/snps_emsk/soc_config.c b/soc/arc/snps_emsk/soc_config.c index 4dd05b240c1..d5b67dc6e78 100644 --- a/soc/arc/snps_emsk/soc_config.c +++ b/soc/arc/snps_emsk/soc_config.c @@ -18,14 +18,14 @@ static int uart_ns16550_init(struct device *dev) /* On ARC EM Starter kit board, * send the UART the command to clear the interrupt */ -#ifdef DT_INST_0_NS16550 - sys_write32(0, DT_INST_0_NS16550_BASE_ADDRESS+0x4); - sys_write32(0, DT_INST_0_NS16550_BASE_ADDRESS+0x10); -#endif /* DT_INST_0_NS16550 */ -#ifdef DT_INST_1_NS16550 - sys_write32(0, DT_INST_1_NS16550_BASE_ADDRESS+0x4); - sys_write32(0, DT_INST_1_NS16550_BASE_ADDRESS+0x10); -#endif /* DT_INST_1_NS16550 */ +#if DT_HAS_NODE(DT_INST(0, ns16550)) + sys_write32(0, DT_REG_ADDR(DT_INST(0, ns16550))+0x4); + sys_write32(0, DT_REG_ADDR(DT_INST(0, ns16550))+0x10); +#endif /* DT_HAS_NODE(DT_INST(0, ns16550)) */ +#if DT_HAS_NODE(DT_INST(1, ns16550)) + sys_write32(0, DT_REG_ADDR(DT_INST(1, ns16550))+0x4); + sys_write32(0, DT_REG_ADDR(DT_INST(1, ns16550))+0x10); +#endif /* DT_HAS_NODE(DT_INST(1, ns16550)) */ return 0; } diff --git a/soc/arc/snps_nsim/dts_fixup.h b/soc/arc/snps_nsim/dts_fixup.h index 2fa8e04c8f2..8a48fbdac68 100644 --- a/soc/arc/snps_nsim/dts_fixup.h +++ b/soc/arc/snps_nsim/dts_fixup.h @@ -3,10 +3,10 @@ /* SoC level DTS fixup file */ /* CCM configuration */ -#define DT_DCCM_BASE_ADDRESS DT_INST_0_ARC_DCCM_BASE_ADDRESS -#define DT_DCCM_SIZE (DT_INST_0_ARC_DCCM_SIZE >> 10) +#define DT_DCCM_BASE_ADDRESS DT_REG_ADDR(DT_INST(0, arc_dccm)) +#define DT_DCCM_SIZE (DT_REG_SIZE(DT_INST(0, arc_dccm)) >> 10) -#define DT_ICCM_BASE_ADDRESS DT_INST_0_ARC_ICCM_BASE_ADDRESS -#define DT_ICCM_SIZE (DT_INST_0_ARC_ICCM_SIZE >> 10) +#define DT_ICCM_BASE_ADDRESS DT_REG_ADDR(DT_INST(0, arc_iccm)) +#define DT_ICCM_SIZE (DT_REG_SIZE(DT_INST(0, arc_iccm)) >> 10) /* End of SoC Level DTS fixup file */