drivers: intc: intc_shared_irq: Convert to new DT_INST macros
Convert older DT_INST_ macro use the new include/devicetree.h
DT_INST macro APIs.
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
diff --git a/drivers/interrupt_controller/intc_shared_irq.c b/drivers/interrupt_controller/intc_shared_irq.c
index 00f0cce..092c68e 100644
--- a/drivers/interrupt_controller/intc_shared_irq.c
+++ b/drivers/interrupt_controller/intc_shared_irq.c
@@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
+#define DT_DRV_COMPAT shared_irq
+
#include <errno.h>
#include <kernel.h>
@@ -125,24 +127,24 @@
void shared_irq_config_0_irq(void);
const struct shared_irq_config shared_irq_config_0 = {
- .irq_num = DT_INST_0_SHARED_IRQ_IRQ_0,
+ .irq_num = DT_INST_IRQN(0),
.client_count = CONFIG_SHARED_IRQ_NUM_CLIENTS,
.config = shared_irq_config_0_irq
};
struct shared_irq_runtime shared_irq_0_runtime;
-DEVICE_AND_API_INIT(shared_irq_0, DT_INST_0_SHARED_IRQ_LABEL,
+DEVICE_AND_API_INIT(shared_irq_0, DT_INST_LABEL(0),
shared_irq_initialize, &shared_irq_0_runtime,
&shared_irq_config_0, POST_KERNEL,
CONFIG_SHARED_IRQ_INIT_PRIORITY, &api_funcs);
void shared_irq_config_0_irq(void)
{
- IRQ_CONNECT(DT_INST_0_SHARED_IRQ_IRQ_0,
- DT_INST_0_SHARED_IRQ_IRQ_0_PRIORITY,
+ IRQ_CONNECT(DT_INST_IRQN(0),
+ DT_INST_IRQ(0, priority),
shared_irq_isr, DEVICE_GET(shared_irq_0),
- DT_INST_0_SHARED_IRQ_IRQ_0_SENSE);
+ DT_INST_IRQ(0, sense));
}
#endif /* CONFIG_SHARED_IRQ_0 */
@@ -151,24 +153,24 @@
void shared_irq_config_1_irq(void);
const struct shared_irq_config shared_irq_config_1 = {
- .irq_num = DT_INST_1_SHARED_IRQ_IRQ_0,
+ .irq_num = DT_INST_IRQN(1),
.client_count = CONFIG_SHARED_IRQ_NUM_CLIENTS,
.config = shared_irq_config_1_irq
};
struct shared_irq_runtime shared_irq_1_runtime;
-DEVICE_AND_API_INIT(shared_irq_1, DT_INST_1_SHARED_IRQ_LABEL,
+DEVICE_AND_API_INIT(shared_irq_1, DT_INST_LABEL(1),
shared_irq_initialize, &shared_irq_1_runtime,
&shared_irq_config_1, POST_KERNEL,
CONFIG_SHARED_IRQ_INIT_PRIORITY, &api_funcs);
void shared_irq_config_1_irq(void)
{
- IRQ_CONNECT(DT_INST_1_SHARED_IRQ_IRQ_0,
- DT_INST_1_SHARED_IRQ_IRQ_0_PRIORITY,
+ IRQ_CONNECT(DT_INST_IRQN(1),
+ DT_INST_IRQ(1, priority),
shared_irq_isr, DEVICE_GET(shared_irq_1),
- DT_INST_1_SHARED_IRQ_IRQ_0_SENSE);
+ DT_INST_IRQ(1, sense));
}
#endif /* CONFIG_SHARED_IRQ_1 */
