From c68a1d427d4fd5b7e9e242a11e3ef5e7f7f7aca2 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Fri, 14 Feb 2020 09:15:27 -0600 Subject: [PATCH] drivers: espi: mchp_xec: convert to DT_INST defines Convert driver to use DT_INST_ defines. The preferred defines for drivers are DT_INST_. The driver mostly used DT_INST_ defines but a few IRQ priority defines needed conversion. Signed-off-by: Kumar Gala --- drivers/espi/espi_mchp_xec.c | 9 ++++++--- soc/arm/microchip_mec/mec1501/dts_fixup.h | 7 ------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/espi/espi_mchp_xec.c b/drivers/espi/espi_mchp_xec.c index 7ff40f0542b..a902c7d7587 100644 --- a/drivers/espi/espi_mchp_xec.c +++ b/drivers/espi/espi_mchp_xec.c @@ -1100,21 +1100,24 @@ static int espi_xec_init(struct device *dev) /* Enable aggregated interrupt block for eSPI bus events */ MCHP_GIRQ_BLK_SETEN(config->bus_girq_id); IRQ_CONNECT(DT_INST_0_MICROCHIP_XEC_ESPI_IRQ_0, - DT_ESPI_MCHP_XEC_0_IRQ_PRIORITY, espi_xec_bus_isr, + DT_INST_0_MICROCHIP_XEC_ESPI_IRQ_0_PRIORITY, + espi_xec_bus_isr, DEVICE_GET(espi_xec_0), 0); irq_enable(DT_INST_0_MICROCHIP_XEC_ESPI_IRQ_0); /* Enable aggregated interrupt block for eSPI VWire events */ MCHP_GIRQ_BLK_SETEN(config->vw_girq_id); IRQ_CONNECT(DT_INST_0_MICROCHIP_XEC_ESPI_IRQ_1, - DT_ESPI_MCHP_XEC_1_IRQ_PRIORITY, espi_xec_vw_isr, + DT_INST_0_MICROCHIP_XEC_ESPI_IRQ_1_PRIORITY, + espi_xec_vw_isr, DEVICE_GET(espi_xec_0), 0); irq_enable(DT_INST_0_MICROCHIP_XEC_ESPI_IRQ_1); /* Enable aggregated interrupt block for eSPI peripheral channel */ MCHP_GIRQ_BLK_SETEN(config->pc_girq_id); IRQ_CONNECT(DT_INST_0_MICROCHIP_XEC_ESPI_IRQ_2, - DT_ESPI_MCHP_XEC_2_IRQ_PRIORITY, espi_xec_periph_isr, + DT_INST_0_MICROCHIP_XEC_ESPI_IRQ_2_PRIORITY, + espi_xec_periph_isr, DEVICE_GET(espi_xec_0), 0); irq_enable(DT_INST_0_MICROCHIP_XEC_ESPI_IRQ_2); diff --git a/soc/arm/microchip_mec/mec1501/dts_fixup.h b/soc/arm/microchip_mec/mec1501/dts_fixup.h index 06cef5db303..ab7b0a94cf5 100644 --- a/soc/arm/microchip_mec/mec1501/dts_fixup.h +++ b/soc/arm/microchip_mec/mec1501/dts_fixup.h @@ -147,10 +147,3 @@ DT_MICROCHIP_XEC_QMSPI_40070000_DLDH #define DT_SPI_XEC_QMSPI_0_DCSDA \ DT_MICROCHIP_XEC_QMSPI_40070000_DCSDA - -#define DT_ESPI_MCHP_XEC_0_IRQ_PRIORITY \ - DT_MICROCHIP_XEC_ESPI_400F3400_IRQ_0_PRIORITY -#define DT_ESPI_MCHP_XEC_1_IRQ_PRIORITY \ - DT_MICROCHIP_XEC_ESPI_400F3400_IRQ_1_PRIORITY -#define DT_ESPI_MCHP_XEC_2_IRQ_PRIORITY \ - DT_MICROCHIP_XEC_ESPI_400F3400_IRQ_2_PRIORITY