diff --git a/drivers/interrupt_controller/intc_dw.c b/drivers/interrupt_controller/intc_dw.c
index 17746c90f23..55a392d8659 100644
--- a/drivers/interrupt_controller/intc_dw.c
+++ b/drivers/interrupt_controller/intc_dw.c
@@ -126,8 +126,8 @@ static int dw_ictl_intr_get_line_state(struct device *dev, unsigned int irq)
 static void dw_ictl_config_irq(struct device *dev);
 
 static const struct dw_ictl_config dw_config = {
-	.base_addr = DT_INTC_DW_0_BASE_ADDR,
-	.numirqs = DT_INTC_DW_0_NUM_IRQS,
+	.base_addr = DT_INST_0_SNPS_DESIGNWARE_INTC_BASE_ADDRESS,
+	.numirqs = DT_INST_0_SNPS_DESIGNWARE_INTC_NUM_IRQS,
 	.isr_table_offset = CONFIG_DW_ISR_TBL_OFFSET,
 	.config_func = dw_ictl_config_irq,
 };
@@ -139,12 +139,15 @@ static const struct irq_next_level_api dw_ictl_apis = {
 	.intr_get_line_state = dw_ictl_intr_get_line_state,
 };
 
-DEVICE_AND_API_INIT(dw_ictl, DT_INTC_DW_0_NAME, dw_ictl_initialize,
-		    NULL, &dw_config,
+DEVICE_AND_API_INIT(dw_ictl, DT_INST_0_SNPS_DESIGNWARE_INTC_LABEL,
+		    dw_ictl_initialize, NULL, &dw_config,
 		    POST_KERNEL, CONFIG_DW_ICTL_INIT_PRIORITY, &dw_ictl_apis);
 
 static void dw_ictl_config_irq(struct device *port)
 {
-	IRQ_CONNECT(DT_INTC_DW_0_IRQ, DT_INTC_DW_0_IRQ_PRI, dw_ictl_isr,
-		    DEVICE_GET(dw_ictl), DT_INTC_DW_0_IRQ_FLAGS);
+	IRQ_CONNECT(DT_INST_0_SNPS_DESIGNWARE_INTC_IRQ_0,
+		    DT_INST_0_SNPS_DESIGNWARE_INTC_IRQ_0_PRIORITY,
+		    dw_ictl_isr,
+		    DEVICE_GET(dw_ictl),
+		    DT_INST_0_SNPS_DESIGNWARE_INTC_IRQ_0_SENSE);
 }
diff --git a/soc/xtensa/intel_s1000/dts_fixup.h b/soc/xtensa/intel_s1000/dts_fixup.h
index 07ffbdc6dae..b9890adf0ea 100644
--- a/soc/xtensa/intel_s1000/dts_fixup.h
+++ b/soc/xtensa/intel_s1000/dts_fixup.h
@@ -35,16 +35,6 @@
 #define DT_CAVS_ICTL_3_IRQ_PRI		DT_INTEL_CAVS_INTC_78830_IRQ_0_PRIORITY
 #define DT_CAVS_ICTL_3_IRQ_FLAGS			DT_INTEL_CAVS_INTC_78830_IRQ_0_SENSE
 
-#define DT_INTC_DW_0_BASE_ADDR		\
-	DT_SNPS_DESIGNWARE_INTC_81800_BASE_ADDRESS
-#define DT_INTC_DW_0_NAME		DT_SNPS_DESIGNWARE_INTC_81800_LABEL
-#define DT_INTC_DW_0_IRQ		DT_SNPS_DESIGNWARE_INTC_81800_IRQ_0
-#define DT_INTC_DW_0_IRQ_PRI		\
-	DT_SNPS_DESIGNWARE_INTC_81800_IRQ_0_PRIORITY
-#define DT_INTC_DW_0_IRQ_FLAGS		\
-	DT_SNPS_DESIGNWARE_INTC_81800_IRQ_0_SENSE
-#define DT_INTC_DW_0_NUM_IRQS		DT_SNPS_DESIGNWARE_INTC_81800_NUM_IRQS
-
 #define DT_INST_0_SNPS_DESIGNWARE_SPI_IRQ_FLAGS		0
 
 #define DT_INST_0_SNPS_DESIGNWARE_GPIO_IRQ_0_FLAGS	0
diff --git a/soc/xtensa/intel_s1000/soc.c b/soc/xtensa/intel_s1000/soc.c
index ca1bba0662e..ba0c4eaca7a 100644
--- a/soc/xtensa/intel_s1000/soc.c
+++ b/soc/xtensa/intel_s1000/soc.c
@@ -54,7 +54,7 @@ void z_soc_irq_enable(u32_t irq)
 
 	switch (CAVS_IRQ_NUMBER(irq)) {
 	case DW_ICTL_IRQ_CAVS_OFFSET:
-		dev_ictl = device_get_binding(DT_INTC_DW_0_NAME);
+		dev_ictl = device_get_binding(DT_INST_0_SNPS_DESIGNWARE_INTC_LABEL);
 		break;
 	default:
 		/* The source of the interrupt is in CAVS interrupt logic */
@@ -112,7 +112,7 @@ void z_soc_irq_disable(u32_t irq)
 
 	switch (CAVS_IRQ_NUMBER(irq)) {
 	case DW_ICTL_IRQ_CAVS_OFFSET:
-		dev_ictl = device_get_binding(DT_INTC_DW_0_NAME);
+		dev_ictl = device_get_binding(DT_INST_0_SNPS_DESIGNWARE_INTC_LABEL);
 		break;
 	default:
 		/* The source of the interrupt is in CAVS interrupt logic */
@@ -179,7 +179,7 @@ int z_soc_irq_is_enabled(unsigned int irq)
 
 	switch (CAVS_IRQ_NUMBER(irq)) {
 	case DW_ICTL_IRQ_CAVS_OFFSET:
-		dev_ictl = device_get_binding(DT_INTC_DW_0_NAME);
+		dev_ictl = device_get_binding(DT_INST_0_SNPS_DESIGNWARE_INTC_LABEL);
 		break;
 	default:
 		/* The source of the interrupt is in CAVS interrupt logic */
diff --git a/soc/xtensa/intel_s1000/soc.h b/soc/xtensa/intel_s1000/soc.h
index 48919f702ab..eef123a8210 100644
--- a/soc/xtensa/intel_s1000/soc.h
+++ b/soc/xtensa/intel_s1000/soc.h
@@ -43,7 +43,7 @@
 #define IOAPIC_HIGH				0
 
 /* DW interrupt controller */
-#define DW_ICTL_IRQ_CAVS_OFFSET			CAVS_IRQ_NUMBER(DT_INTC_DW_0_IRQ)
+#define DW_ICTL_IRQ_CAVS_OFFSET			CAVS_IRQ_NUMBER(DT_INST_0_SNPS_DESIGNWARE_INTC_IRQ_0)
 #define DW_ICTL_NUM_IRQS			9
 
 /* GPIO */