Skip to content

Commit

Permalink
drivers: Update DT IRQ alias defines
Browse files Browse the repository at this point in the history 
The defines should have had a _0 on them, now that we generate the
proper defines, fixup the cases that used that old scheme.

Signed-off-by: Kumar Gala <[email protected]>
  • Loading branch information
@galak
galak committed Jun 21, 2019
1 parent 7b638bf commit dba65ce
Show file tree
Hide file tree
Showing 23 changed files with 113 additions and 112 deletions.
4 changes: 2 additions & 2 deletions drivers/adc/adc_nrfx_adc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ static int init_adc(struct device *dev)
return -EBUSY;
}

IRQ_CONNECT(DT_NORDIC_NRF_ADC_ADC_0_IRQ,
DT_NORDIC_NRF_ADC_ADC_0_IRQ_PRIORITY,
IRQ_CONNECT(DT_NORDIC_NRF_ADC_ADC_0_IRQ_0,
DT_NORDIC_NRF_ADC_ADC_0_IRQ_0_PRIORITY,
nrfx_isr, nrfx_adc_irq_handler, 0);

adc_context_unlock_unconditionally(&m_data.ctx);
Expand Down
6 changes: 3 additions & 3 deletions drivers/adc/adc_nrfx_saadc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,10 @@ static int init_saadc(struct device *dev)
nrf_saadc_event_clear(NRF_SAADC_EVENT_CALIBRATEDONE);
nrf_saadc_int_enable(NRF_SAADC_INT_END
| NRF_SAADC_INT_CALIBRATEDONE);
NRFX_IRQ_ENABLE(DT_NORDIC_NRF_SAADC_ADC_0_IRQ);
NRFX_IRQ_ENABLE(DT_NORDIC_NRF_SAADC_ADC_0_IRQ_0);

IRQ_CONNECT(DT_NORDIC_NRF_SAADC_ADC_0_IRQ,
DT_NORDIC_NRF_SAADC_ADC_0_IRQ_PRIORITY,
IRQ_CONNECT(DT_NORDIC_NRF_SAADC_ADC_0_IRQ_0,
DT_NORDIC_NRF_SAADC_ADC_0_IRQ_0_PRIORITY,
saadc_irq_handler, DEVICE_GET(adc_0), 0);

adc_context_unlock_unconditionally(&m_data.ctx);
Expand Down
4 changes: 2 additions & 2 deletions drivers/counter/counter_nrfx_rtc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@ static const struct counter_driver_api counter_nrfx_driver_api = {
} \
static int counter_##idx##_init(struct device *dev) \
{ \
IRQ_CONNECT(DT_NORDIC_NRF_RTC_RTC_##idx##_IRQ, \
DT_NORDIC_NRF_RTC_RTC_##idx##_IRQ_PRIORITY, \
IRQ_CONNECT(DT_NORDIC_NRF_RTC_RTC_##idx##_IRQ_0, \
DT_NORDIC_NRF_RTC_RTC_##idx##_IRQ_0_PRIORITY, \
nrfx_isr, nrfx_rtc_##idx##_irq_handler, 0); \
const nrfx_rtc_config_t config = { \
.prescaler = \
Expand Down
4 changes: 2 additions & 2 deletions drivers/counter/counter_nrfx_timer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ static const struct counter_driver_api counter_nrfx_driver_api = {
"TIMER prescaler out of range"); \
static int counter_##idx##_init(struct device *dev) \
{ \
IRQ_CONNECT(DT_NORDIC_NRF_TIMER_TIMER_##idx##_IRQ, \
DT_NORDIC_NRF_TIMER_TIMER_##idx##_IRQ_PRIORITY, \
IRQ_CONNECT(DT_NORDIC_NRF_TIMER_TIMER_##idx##_IRQ_0, \
DT_NORDIC_NRF_TIMER_TIMER_##idx##_IRQ_0_PRIORITY, \
nrfx_isr, nrfx_timer_##idx##_irq_handler, 0); \
const nrfx_timer_config_t config = { \
.frequency = \
Expand Down
40 changes: 20 additions & 20 deletions drivers/gpio/gpio_mcux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static int gpio_mcux_porta_init(struct device *dev);
static const struct gpio_mcux_config gpio_mcux_porta_config = {
.gpio_base = (GPIO_Type *) DT_NXP_KINETIS_GPIO_GPIO_A_BASE_ADDRESS,
.port_base = PORTA,
#ifdef DT_NXP_KINETIS_GPIO_GPIO_A_IRQ
#ifdef DT_NXP_KINETIS_GPIO_GPIO_A_IRQ_0
.flags = GPIO_INT,
#else
.flags = 0,
Expand All @@ -259,11 +259,11 @@ DEVICE_AND_API_INIT(gpio_mcux_porta, DT_NXP_KINETIS_GPIO_GPIO_A_LABEL,

static int gpio_mcux_porta_init(struct device *dev)
{
#ifdef DT_NXP_KINETIS_GPIO_GPIO_A_IRQ
IRQ_CONNECT(DT_NXP_KINETIS_GPIO_GPIO_A_IRQ, DT_NXP_KINETIS_GPIO_GPIO_A_IRQ_PRIORITY,
#ifdef DT_NXP_KINETIS_GPIO_GPIO_A_IRQ_0
IRQ_CONNECT(DT_NXP_KINETIS_GPIO_GPIO_A_IRQ_0, DT_NXP_KINETIS_GPIO_GPIO_A_IRQ_0_PRIORITY,
gpio_mcux_port_isr, DEVICE_GET(gpio_mcux_porta), 0);

irq_enable(DT_NXP_KINETIS_GPIO_GPIO_A_IRQ);
irq_enable(DT_NXP_KINETIS_GPIO_GPIO_A_IRQ_0);
#endif
return 0;
}
Expand All @@ -275,7 +275,7 @@ static int gpio_mcux_portb_init(struct device *dev);
static const struct gpio_mcux_config gpio_mcux_portb_config = {
.gpio_base = (GPIO_Type *) DT_NXP_KINETIS_GPIO_GPIO_B_BASE_ADDRESS,
.port_base = PORTB,
#ifdef DT_NXP_KINETIS_GPIO_GPIO_B_IRQ
#ifdef DT_NXP_KINETIS_GPIO_GPIO_B_IRQ_0
.flags = GPIO_INT,
#else
.flags = 0,
Expand All @@ -292,11 +292,11 @@ DEVICE_AND_API_INIT(gpio_mcux_portb, DT_NXP_KINETIS_GPIO_GPIO_B_LABEL,

static int gpio_mcux_portb_init(struct device *dev)
{
#ifdef DT_NXP_KINETIS_GPIO_GPIO_B_IRQ
IRQ_CONNECT(DT_NXP_KINETIS_GPIO_GPIO_B_IRQ, DT_NXP_KINETIS_GPIO_GPIO_B_IRQ_PRIORITY,
#ifdef DT_NXP_KINETIS_GPIO_GPIO_B_IRQ_0
IRQ_CONNECT(DT_NXP_KINETIS_GPIO_GPIO_B_IRQ_0, DT_NXP_KINETIS_GPIO_GPIO_B_IRQ_0_PRIORITY,
gpio_mcux_port_isr, DEVICE_GET(gpio_mcux_portb), 0);

irq_enable(DT_NXP_KINETIS_GPIO_GPIO_B_IRQ);
irq_enable(DT_NXP_KINETIS_GPIO_GPIO_B_IRQ_0);
#endif
return 0;
}
Expand All @@ -308,7 +308,7 @@ static int gpio_mcux_portc_init(struct device *dev);
static const struct gpio_mcux_config gpio_mcux_portc_config = {
.gpio_base = (GPIO_Type *) DT_NXP_KINETIS_GPIO_GPIO_C_BASE_ADDRESS,
.port_base = PORTC,
#ifdef DT_NXP_KINETIS_GPIO_GPIO_C_IRQ
#ifdef DT_NXP_KINETIS_GPIO_GPIO_C_IRQ_0
.flags = GPIO_INT,
#else
.flags = 0,
Expand All @@ -325,11 +325,11 @@ DEVICE_AND_API_INIT(gpio_mcux_portc, DT_NXP_KINETIS_GPIO_GPIO_C_LABEL,

static int gpio_mcux_portc_init(struct device *dev)
{
#ifdef DT_NXP_KINETIS_GPIO_GPIO_C_IRQ
IRQ_CONNECT(DT_NXP_KINETIS_GPIO_GPIO_C_IRQ, DT_NXP_KINETIS_GPIO_GPIO_C_IRQ_PRIORITY,
#ifdef DT_NXP_KINETIS_GPIO_GPIO_C_IRQ_0
IRQ_CONNECT(DT_NXP_KINETIS_GPIO_GPIO_C_IRQ_0, DT_NXP_KINETIS_GPIO_GPIO_C_IRQ_0_PRIORITY,
gpio_mcux_port_isr, DEVICE_GET(gpio_mcux_portc), 0);

irq_enable(DT_NXP_KINETIS_GPIO_GPIO_C_IRQ);
irq_enable(DT_NXP_KINETIS_GPIO_GPIO_C_IRQ_0);
#endif
return 0;
}
Expand All @@ -341,7 +341,7 @@ static int gpio_mcux_portd_init(struct device *dev);
static const struct gpio_mcux_config gpio_mcux_portd_config = {
.gpio_base = (GPIO_Type *) DT_NXP_KINETIS_GPIO_GPIO_D_BASE_ADDRESS,
.port_base = PORTD,
#ifdef DT_NXP_KINETIS_GPIO_GPIO_D_IRQ
#ifdef DT_NXP_KINETIS_GPIO_GPIO_D_IRQ_0
.flags = GPIO_INT,
#else
.flags = 0,
Expand All @@ -358,11 +358,11 @@ DEVICE_AND_API_INIT(gpio_mcux_portd, DT_NXP_KINETIS_GPIO_GPIO_D_LABEL,

static int gpio_mcux_portd_init(struct device *dev)
{
#ifdef DT_NXP_KINETIS_GPIO_GPIO_D_IRQ
IRQ_CONNECT(DT_NXP_KINETIS_GPIO_GPIO_D_IRQ, DT_NXP_KINETIS_GPIO_GPIO_D_IRQ_PRIORITY,
#ifdef DT_NXP_KINETIS_GPIO_GPIO_D_IRQ_0
IRQ_CONNECT(DT_NXP_KINETIS_GPIO_GPIO_D_IRQ_0, DT_NXP_KINETIS_GPIO_GPIO_D_IRQ_0_PRIORITY,
gpio_mcux_port_isr, DEVICE_GET(gpio_mcux_portd), 0);

irq_enable(DT_NXP_KINETIS_GPIO_GPIO_D_IRQ);
irq_enable(DT_NXP_KINETIS_GPIO_GPIO_D_IRQ_0);
#endif
return 0;
}
Expand All @@ -374,7 +374,7 @@ static int gpio_mcux_porte_init(struct device *dev);
static const struct gpio_mcux_config gpio_mcux_porte_config = {
.gpio_base = (GPIO_Type *) DT_NXP_KINETIS_GPIO_GPIO_E_BASE_ADDRESS,
.port_base = PORTE,
#ifdef DT_NXP_KINETIS_GPIO_GPIO_E_IRQ
#ifdef DT_NXP_KINETIS_GPIO_GPIO_E_IRQ_0
.flags = GPIO_INT,
#else
.flags = 0,
Expand All @@ -391,11 +391,11 @@ DEVICE_AND_API_INIT(gpio_mcux_porte, DT_NXP_KINETIS_GPIO_GPIO_E_LABEL,

static int gpio_mcux_porte_init(struct device *dev)
{
#ifdef DT_NXP_KINETIS_GPIO_GPIO_E_IRQ
IRQ_CONNECT(DT_NXP_KINETIS_GPIO_GPIO_E_IRQ, DT_NXP_KINETIS_GPIO_GPIO_E_IRQ_PRIORITY,
#ifdef DT_NXP_KINETIS_GPIO_GPIO_E_IRQ_0
IRQ_CONNECT(DT_NXP_KINETIS_GPIO_GPIO_E_IRQ_0, DT_NXP_KINETIS_GPIO_GPIO_E_IRQ_0_PRIORITY,
gpio_mcux_port_isr, DEVICE_GET(gpio_mcux_porte), 0);

irq_enable(DT_NXP_KINETIS_GPIO_GPIO_E_IRQ);
irq_enable(DT_NXP_KINETIS_GPIO_GPIO_E_IRQ_0);
#endif
return 0;
}
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpio/gpio_nrfx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,11 +475,11 @@ static int gpio_nrfx_init(struct device *port)

if (!gpio_initialized) {
gpio_initialized = true;
IRQ_CONNECT(DT_NORDIC_NRF_GPIOTE_GPIOTE_0_IRQ,
DT_NORDIC_NRF_GPIOTE_GPIOTE_0_IRQ_PRIORITY,
IRQ_CONNECT(DT_NORDIC_NRF_GPIOTE_GPIOTE_0_IRQ_0,
DT_NORDIC_NRF_GPIOTE_GPIOTE_0_IRQ_0_PRIORITY,
gpiote_event_handler, NULL, 0);

irq_enable(DT_NORDIC_NRF_GPIOTE_GPIOTE_0_IRQ);
irq_enable(DT_NORDIC_NRF_GPIOTE_GPIOTE_0_IRQ_0);
nrf_gpiote_int_enable(NRF_GPIOTE_INT_PORT_MASK);
}

Expand Down
50 changes: 25 additions & 25 deletions drivers/gpio/gpio_rv32m1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ static int gpio_rv32m1_porta_init(struct device *dev);
static const struct gpio_rv32m1_config gpio_rv32m1_porta_config = {
.gpio_base = (GPIO_Type *) DT_OPENISA_RV32M1_GPIO_GPIO_A_BASE_ADDRESS,
.port_base = PORTA,
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ_0
.flags = GPIO_INT,
#else
.flags = 0,
Expand All @@ -294,12 +294,12 @@ DEVICE_AND_API_INIT(gpio_rv32m1_porta, DT_OPENISA_RV32M1_GPIO_GPIO_A_LABEL,

static int gpio_rv32m1_porta_init(struct device *dev)
{
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ
IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ,
DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ_PRIORITY,
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ_0
IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ_0,
DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ_0_PRIORITY,
gpio_rv32m1_port_isr, DEVICE_GET(gpio_rv32m1_porta), 0);

irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ);
irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_A_IRQ_0);

return 0;
#else
Expand All @@ -314,7 +314,7 @@ static int gpio_rv32m1_portb_init(struct device *dev);
static const struct gpio_rv32m1_config gpio_rv32m1_portb_config = {
.gpio_base = (GPIO_Type *) DT_OPENISA_RV32M1_GPIO_GPIO_B_BASE_ADDRESS,
.port_base = PORTB,
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ_0
.flags = GPIO_INT,
#else
.flags = 0,
Expand All @@ -339,12 +339,12 @@ DEVICE_AND_API_INIT(gpio_rv32m1_portb, DT_OPENISA_RV32M1_GPIO_GPIO_B_LABEL,

static int gpio_rv32m1_portb_init(struct device *dev)
{
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ
IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ,
DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ_PRIORITY,
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ_0
IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ_0,
DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ_0_PRIORITY,
gpio_rv32m1_port_isr, DEVICE_GET(gpio_rv32m1_portb), 0);

irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ);
irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_B_IRQ_0);

return 0;
#else
Expand All @@ -359,7 +359,7 @@ static int gpio_rv32m1_portc_init(struct device *dev);
static const struct gpio_rv32m1_config gpio_rv32m1_portc_config = {
.gpio_base = (GPIO_Type *) DT_OPENISA_RV32M1_GPIO_GPIO_C_BASE_ADDRESS,
.port_base = PORTC,
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ_0
.flags = GPIO_INT,
#else
.flags = 0,
Expand All @@ -385,12 +385,12 @@ DEVICE_AND_API_INIT(gpio_rv32m1_portc, DT_OPENISA_RV32M1_GPIO_GPIO_C_LABEL,

static int gpio_rv32m1_portc_init(struct device *dev)
{
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ
IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ,
DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ_PRIORITY,
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ_0
IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ_0,
DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ_0_PRIORITY,
gpio_rv32m1_port_isr, DEVICE_GET(gpio_rv32m1_portc), 0);

irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ);
irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_C_IRQ_0);

return 0;
#else
Expand All @@ -405,7 +405,7 @@ static int gpio_rv32m1_portd_init(struct device *dev);
static const struct gpio_rv32m1_config gpio_rv32m1_portd_config = {
.gpio_base = (GPIO_Type *) DT_OPENISA_RV32M1_GPIO_GPIO_D_BASE_ADDRESS,
.port_base = PORTD,
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ_0
.flags = GPIO_INT,
#else
.flags = 0,
Expand All @@ -430,12 +430,12 @@ DEVICE_AND_API_INIT(gpio_rv32m1_portd, DT_OPENISA_RV32M1_GPIO_GPIO_D_LABEL,

static int gpio_rv32m1_portd_init(struct device *dev)
{
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ
IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ,
DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ_PRIORITY,
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ_0
IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ_0,
DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ_0_PRIORITY,
gpio_rv32m1_port_isr, DEVICE_GET(gpio_rv32m1_portd), 0);

irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ);
irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_D_IRQ_0);

return 0;
#else
Expand All @@ -450,7 +450,7 @@ static int gpio_rv32m1_porte_init(struct device *dev);
static const struct gpio_rv32m1_config gpio_rv32m1_porte_config = {
.gpio_base = (GPIO_Type *) DT_OPENISA_RV32M1_GPIO_GPIO_E_BASE_ADDRESS,
.port_base = PORTE,
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ_0
.flags = GPIO_INT,
#else
.flags = 0,
Expand All @@ -475,12 +475,12 @@ DEVICE_AND_API_INIT(gpio_rv32m1_porte, DT_OPENISA_RV32M1_GPIO_GPIO_E_LABEL,

static int gpio_rv32m1_porte_init(struct device *dev)
{
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ
IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ,
DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ_PRIORITY,
#ifdef DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ_0
IRQ_CONNECT(DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ_0,
DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ_0_PRIORITY,
gpio_rv32m1_port_isr, DEVICE_GET(gpio_rv32m1_porte), 0);

irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ);
irq_enable(DT_OPENISA_RV32M1_GPIO_GPIO_E_IRQ_0);

return 0;
#else
Expand Down
16 changes: 8 additions & 8 deletions drivers/i2c/i2c_imx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,10 @@ static void i2c_imx_config_func_1(struct device *dev)
{
ARG_UNUSED(dev);

IRQ_CONNECT(DT_FSL_IMX7D_I2C_I2C_1_IRQ, DT_FSL_IMX7D_I2C_I2C_1_IRQ_PRIORITY,
IRQ_CONNECT(DT_FSL_IMX7D_I2C_I2C_1_IRQ_0, DT_FSL_IMX7D_I2C_I2C_1_IRQ_0_PRIORITY,
i2c_imx_isr, DEVICE_GET(i2c_imx_1), 0);

irq_enable(DT_FSL_IMX7D_I2C_I2C_1_IRQ);
irq_enable(DT_FSL_IMX7D_I2C_I2C_1_IRQ_0);
}
#endif /* CONFIG_I2C_1 */

Expand All @@ -400,10 +400,10 @@ static void i2c_imx_config_func_2(struct device *dev)
{
ARG_UNUSED(dev);

IRQ_CONNECT(DT_FSL_IMX7D_I2C_I2C_2_IRQ, DT_FSL_IMX7D_I2C_I2C_2_IRQ_PRIORITY,
IRQ_CONNECT(DT_FSL_IMX7D_I2C_I2C_2_IRQ_0, DT_FSL_IMX7D_I2C_I2C_2_IRQ_0_PRIORITY,
i2c_imx_isr, DEVICE_GET(i2c_imx_2), 0);

irq_enable(DT_FSL_IMX7D_I2C_I2C_2_IRQ);
irq_enable(DT_FSL_IMX7D_I2C_I2C_2_IRQ_0);
}
#endif /* CONFIG_I2C_2 */

Expand All @@ -427,10 +427,10 @@ static void i2c_imx_config_func_3(struct device *dev)
{
ARG_UNUSED(dev);

IRQ_CONNECT(DT_FSL_IMX7D_I2C_I2C_3_IRQ, DT_FSL_IMX7D_I2C_I2C_3_IRQ_PRIORITY,
IRQ_CONNECT(DT_FSL_IMX7D_I2C_I2C_3_IRQ_0, DT_FSL_IMX7D_I2C_I2C_3_IRQ_0_PRIORITY,
i2c_imx_isr, DEVICE_GET(i2c_imx_3), 0);

irq_enable(DT_FSL_IMX7D_I2C_I2C_3_IRQ);
irq_enable(DT_FSL_IMX7D_I2C_I2C_3_IRQ_0);
}
#endif /* CONFIG_I2C_3 */

Expand All @@ -453,9 +453,9 @@ DEVICE_AND_API_INIT(i2c_imx_4, DT_FSL_IMX7D_I2C_I2C_4_LABEL, &i2c_imx_init,
static void i2c_imx_config_func_4(struct device *dev)
{
ARG_UNUSED(dev);
IRQ_CONNECT(DT_FSL_IMX7D_I2C_I2C_4_IRQ, DT_FSL_IMX7D_I2C_I2C_4_IRQ_PRIORITY,
IRQ_CONNECT(DT_FSL_IMX7D_I2C_I2C_4_IRQ_0, DT_FSL_IMX7D_I2C_I2C_4_IRQ_0_PRIORITY,
i2c_imx_isr, DEVICE_GET(i2c_imx_4), 0);

irq_enable(DT_FSL_IMX7D_I2C_I2C_4_IRQ);
irq_enable(DT_FSL_IMX7D_I2C_I2C_4_IRQ_0);
}
#endif /* CONFIG_I2C_4 */
4 changes: 2 additions & 2 deletions drivers/i2c/i2c_nrfx_twi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ static int init_twi(struct device *dev, const nrfx_twi_config_t *config)
"Wrong I2C " #idx " frequency setting in dts"); \
static int twi_##idx##_init(struct device *dev) \
{ \
IRQ_CONNECT(DT_NORDIC_NRF_I2C_I2C_##idx##_IRQ, \
DT_NORDIC_NRF_I2C_I2C_##idx##_IRQ_PRIORITY, \
IRQ_CONNECT(DT_NORDIC_NRF_I2C_I2C_##idx##_IRQ_0, \
DT_NORDIC_NRF_I2C_I2C_##idx##_IRQ_0_PRIORITY, \
nrfx_isr, nrfx_twi_##idx##_irq_handler, 0); \
const nrfx_twi_config_t config = { \
.scl = DT_NORDIC_NRF_I2C_I2C_##idx##_SCL_PIN, \
Expand Down
4 changes: 2 additions & 2 deletions drivers/i2c/i2c_nrfx_twim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ static int init_twim(struct device *dev, const nrfx_twim_config_t *config)
"Wrong I2C " #idx " frequency setting in dts"); \
static int twim_##idx##_init(struct device *dev) \
{ \
IRQ_CONNECT(DT_NORDIC_NRF_I2C_I2C_##idx##_IRQ, \
DT_NORDIC_NRF_I2C_I2C_##idx##_IRQ_PRIORITY, \
IRQ_CONNECT(DT_NORDIC_NRF_I2C_I2C_##idx##_IRQ_0, \
DT_NORDIC_NRF_I2C_I2C_##idx##_IRQ_0_PRIORITY, \
nrfx_isr, nrfx_twim_##idx##_irq_handler, 0); \
const nrfx_twim_config_t config = { \
.scl = DT_NORDIC_NRF_I2C_I2C_##idx##_SCL_PIN, \
Expand Down
Loading

0 comments on commit dba65ce

Please sign in to comment.