michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: espi: Convert drivers to new DT device macros

Browse source 
Convert espi drivers to use new DT variants of the DEVICE APIs.
    DEVICE_AND_API_INIT -> DEVICE_DT_DEFINE
    DEVICE_GET -> DEVICE_DT_GET

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-12-15 08:11:29 -06:00 • committed by Maureen Helm
commit 3dfcdd81e1
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/espi/espi_mchp_xec.c
View file

@ -1293,8 +1293,8 @@ static const struct espi_xec_config espi_xec_config = {
.pc_girq_id = DT_INST_PROP(0, pc_girq), .pc_girq_id = DT_INST_PROP(0, pc_girq),
}; };
DEVICE_AND_API_INIT(espi_xec_0, DT_INST_LABEL(0), DEVICE_DT_INST_DEFINE(0, &espi_xec_init, device_pm_control_nop,
&espi_xec_init, &espi_xec_data, &espi_xec_config, &espi_xec_data, &espi_xec_config,
PRE_KERNEL_2, CONFIG_ESPI_INIT_PRIORITY, PRE_KERNEL_2, CONFIG_ESPI_INIT_PRIORITY,
&espi_xec_driver_api); &espi_xec_driver_api);
@ -1391,7 +1391,7 @@ static int espi_xec_init(const struct device *dev)
IRQ_CONNECT(DT_INST_IRQN(0), IRQ_CONNECT(DT_INST_IRQN(0),
DT_INST_IRQ(0, priority), DT_INST_IRQ(0, priority),
espi_xec_bus_isr, espi_xec_bus_isr,
DEVICE_GET(espi_xec_0), 0); DEVICE_DT_INST_GET(0), 0);
irq_enable(DT_INST_IRQN(0)); irq_enable(DT_INST_IRQN(0));
/* Enable aggregated interrupt block for eSPI VWire events */ /* Enable aggregated interrupt block for eSPI VWire events */
@ -1399,7 +1399,7 @@ static int espi_xec_init(const struct device *dev)
IRQ_CONNECT(DT_INST_IRQ_BY_IDX(0, 1, irq), IRQ_CONNECT(DT_INST_IRQ_BY_IDX(0, 1, irq),
DT_INST_IRQ_BY_IDX(0, 1, priority), DT_INST_IRQ_BY_IDX(0, 1, priority),
espi_xec_vw_isr, espi_xec_vw_isr,
DEVICE_GET(espi_xec_0), 0); DEVICE_DT_INST_GET(0), 0);
irq_enable(DT_INST_IRQ_BY_IDX(0, 1, irq)); irq_enable(DT_INST_IRQ_BY_IDX(0, 1, irq));
/* Enable aggregated interrupt block for eSPI peripheral channel */ /* Enable aggregated interrupt block for eSPI peripheral channel */
@ -1407,7 +1407,7 @@ static int espi_xec_init(const struct device *dev)
IRQ_CONNECT(DT_INST_IRQ_BY_IDX(0, 2, irq), IRQ_CONNECT(DT_INST_IRQ_BY_IDX(0, 2, irq),
DT_INST_IRQ_BY_IDX(0, 2, priority), DT_INST_IRQ_BY_IDX(0, 2, priority),
espi_xec_periph_isr, espi_xec_periph_isr,
DEVICE_GET(espi_xec_0), 0); DEVICE_DT_INST_GET(0), 0);
irq_enable(DT_INST_IRQ_BY_IDX(0, 2, irq)); irq_enable(DT_INST_IRQ_BY_IDX(0, 2, irq));
return 0; return 0;

6
drivers/espi/espi_npcx.c
View file

@ -816,8 +816,8 @@ static const struct espi_npcx_config espi_npcx_config = {
.alts_list = espi_alts, .alts_list = espi_alts,
}; };
DEVICE_AND_API_INIT(espi_npcx_0, DT_INST_LABEL(0), DEVICE_DT_INST_DEFINE(0, &espi_npcx_init, device_pm_control_nop,
&espi_npcx_init, &espi_npcx_data, &espi_npcx_config, &espi_npcx_data, &espi_npcx_config,
PRE_KERNEL_2, CONFIG_ESPI_INIT_PRIORITY, PRE_KERNEL_2, CONFIG_ESPI_INIT_PRIORITY,
&espi_npcx_driver_api); &espi_npcx_driver_api);
@ -874,7 +874,7 @@ static int espi_npcx_init(const struct device *dev)
IRQ_CONNECT(DT_INST_IRQN(0), IRQ_CONNECT(DT_INST_IRQN(0),
DT_INST_IRQ(0, priority), DT_INST_IRQ(0, priority),
espi_bus_generic_isr, espi_bus_generic_isr,
DEVICE_GET(espi_npcx_0), 0); DEVICE_DT_INST_GET(0), 0);
/* Enable eSPI bus interrupt */ /* Enable eSPI bus interrupt */
irq_enable(DT_INST_IRQN(0)); irq_enable(DT_INST_IRQN(0));