michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: microchip: Convert microchip drivers to new DT_INST macros

Browse source 
Convert older DT_INST_ macro use in microchip drivers to the new
include/devicetree.h DT_INST macro APIs.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-03-24 15:45:46 -05:00 • committed by Kumar Gala
commit 7a81cd9747
11 changed files with 170 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

34
drivers/ps2/ps2_mchp_xec.c
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define DT_DRV_COMPAT microchip_xec_ps2
#include <errno.h>
#include <device.h>
#include <drivers/ps2.h>
@ -188,15 +190,15 @@ static const struct ps2_driver_api ps2_xec_driver_api = {
static int ps2_xec_init_0(struct device *dev);
static const struct ps2_xec_config ps2_xec_config_0 = {
.base = (PS2_Type *) DT_INST_0_MICROCHIP_XEC_PS2_BASE_ADDRESS,
.girq_id = DT_INST_0_MICROCHIP_XEC_PS2_GIRQ,
.girq_bit = DT_INST_0_MICROCHIP_XEC_PS2_GIRQ_BIT,
.isr_nvic = DT_INST_0_MICROCHIP_XEC_PS2_IRQ_0,
.base = (PS2_Type *) DT_INST_REG_ADDR(0),
.girq_id = DT_INST_PROP(0, girq),
.girq_bit = DT_INST_PROP(0, girq_bit),
.isr_nvic = DT_INST_IRQN(0),
};
static struct ps2_xec_data ps2_xec_port_data_0;
DEVICE_AND_API_INIT(ps2_xec_0, DT_INST_0_MICROCHIP_XEC_PS2_LABEL,
DEVICE_AND_API_INIT(ps2_xec_0, DT_INST_LABEL(0),
&ps2_xec_init_0,
&ps2_xec_port_data_0, &ps2_xec_config_0,
POST_KERNEL, CONFIG_PS2_INIT_PRIORITY,
@ -211,11 +213,11 @@ static int ps2_xec_init_0(struct device *dev)
k_sem_init(&data->tx_lock, 0, 1);
IRQ_CONNECT(DT_INST_0_MICROCHIP_XEC_PS2_IRQ_0,
DT_INST_0_MICROCHIP_XEC_PS2_IRQ_0_PRIORITY,
IRQ_CONNECT(DT_INST_IRQN(0),
DT_INST_IRQ(0, priority),
ps2_xec_isr, DEVICE_GET(ps2_xec_0), 0);
irq_enable(DT_INST_0_MICROCHIP_XEC_PS2_IRQ_0);
irq_enable(DT_INST_IRQN(0));
return 0;
}
@ -225,16 +227,16 @@ static int ps2_xec_init_0(struct device *dev)
static int ps2_xec_init_1(struct device *dev);
static const struct ps2_xec_config ps2_xec_config_1 = {
.base = (PS2_Type *) DT_INST_1_MICROCHIP_XEC_PS2_BASE_ADDRESS,
.girq_id = DT_INST_1_MICROCHIP_XEC_PS2_GIRQ,
.girq_bit = DT_INST_1_MICROCHIP_XEC_PS2_GIRQ_BIT,
.isr_nvic = DT_INST_1_MICROCHIP_XEC_PS2_IRQ_0,
.base = (PS2_Type *) DT_INST_REG_ADDR(1),
.girq_id = DT_INST_PROP(1, girq),
.girq_bit = DT_INST_PROP(1, girq_bit),
.isr_nvic = DT_INST_IRQN(1),
};
static struct ps2_xec_data ps2_xec_port_data_1;
DEVICE_AND_API_INIT(ps2_xec_1, DT_INST_1_MICROCHIP_XEC_PS2_LABEL,
DEVICE_AND_API_INIT(ps2_xec_1, DT_INST_LABEL(1),
&ps2_xec_init_1,
&ps2_xec_port_data_1, &ps2_xec_config_1,
POST_KERNEL, CONFIG_PS2_INIT_PRIORITY,
@ -248,11 +250,11 @@ static int ps2_xec_init_1(struct device *dev)
k_sem_init(&data->tx_lock, 0, 1);
IRQ_CONNECT(DT_INST_1_MICROCHIP_XEC_PS2_IRQ_0,
DT_INST_1_MICROCHIP_XEC_PS2_IRQ_0_PRIORITY,
IRQ_CONNECT(DT_INST_IRQN(1),
DT_INST_IRQ(1, priority),
ps2_xec_isr, DEVICE_GET(ps2_xec_1), 0);
irq_enable(DT_INST_1_MICROCHIP_XEC_PS2_IRQ_0);
irq_enable(DT_INST_IRQN(1));
return 0;
}