michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ipm: ipm_imx: Convert driver to new DT_INST macros

Browse source 
Convert driver to use DT_INST macros.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-04-01 17:13:55 -05:00 • committed by Kumar Gala
commit 5ed7b7e487
3 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/ipm/ipm_imx.c
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#define DT_DRV_COMPAT nxp_imx_mu
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <device.h> #include <device.h>
@ -207,13 +209,13 @@ static const struct ipm_driver_api imx_mu_driver_api = {
static void imx_mu_config_func_b(struct device *dev); static void imx_mu_config_func_b(struct device *dev);
static const struct imx_mu_config imx_mu_b_config = { static const struct imx_mu_config imx_mu_b_config = {
.base = (MU_Type *)DT_IPM_IMX_MU_B_BASE_ADDRESS, .base = (MU_Type *)DT_INST_REG_ADDR(0),
.irq_config_func = imx_mu_config_func_b, .irq_config_func = imx_mu_config_func_b,
}; };
static struct imx_mu_data imx_mu_b_data; static struct imx_mu_data imx_mu_b_data;
DEVICE_AND_API_INIT(mu_b, DT_IPM_IMX_MU_B_NAME, DEVICE_AND_API_INIT(mu_b, DT_INST_LABEL(0),
&imx_mu_init, &imx_mu_init,
&imx_mu_b_data, &imx_mu_b_config, &imx_mu_b_data, &imx_mu_b_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
@ -221,9 +223,9 @@ DEVICE_AND_API_INIT(mu_b, DT_IPM_IMX_MU_B_NAME,
static void imx_mu_config_func_b(struct device *dev) static void imx_mu_config_func_b(struct device *dev)
{ {
IRQ_CONNECT(DT_IPM_IMX_MU_B_IRQ, IRQ_CONNECT(DT_INST_IRQN(0),
DT_IPM_IMX_MU_B_IRQ_PRI, DT_INST_IRQ(0, priority),
imx_mu_isr, DEVICE_GET(mu_b), 0); imx_mu_isr, DEVICE_GET(mu_b), 0);
irq_enable(DT_IPM_IMX_MU_B_IRQ); irq_enable(DT_INST_IRQN(0));
} }

5
soc/arm/nxp_imx/mcimx6x_m4/dts_fixup.h
View file

@ -6,11 +6,6 @@
#define DT_NUM_IRQ_PRIO_BITS DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
#define DT_IPM_IMX_MU_B_BASE_ADDRESS DT_NXP_IMX_MU_4229C000_BASE_ADDRESS
#define DT_IPM_IMX_MU_B_IRQ DT_NXP_IMX_MU_4229C000_IRQ_0
#define DT_IPM_IMX_MU_B_IRQ_PRI DT_NXP_IMX_MU_4229C000_IRQ_0_PRIORITY
#define DT_IPM_IMX_MU_B_NAME DT_NXP_IMX_MU_4229C000_LABEL
#define DT_COUNTER_IMX_EPIT_1_BASE_ADDRESS DT_NXP_IMX_EPIT_420D0000_BASE_ADDRESS #define DT_COUNTER_IMX_EPIT_1_BASE_ADDRESS DT_NXP_IMX_EPIT_420D0000_BASE_ADDRESS
#define DT_COUNTER_IMX_EPIT_1_IRQ DT_NXP_IMX_EPIT_420D0000_IRQ_0 #define DT_COUNTER_IMX_EPIT_1_IRQ DT_NXP_IMX_EPIT_420D0000_IRQ_0
#define DT_COUNTER_IMX_EPIT_1_IRQ_PRI DT_NXP_IMX_EPIT_420D0000_IRQ_0_PRIORITY #define DT_COUNTER_IMX_EPIT_1_IRQ_PRI DT_NXP_IMX_EPIT_420D0000_IRQ_0_PRIORITY

5
soc/arm/nxp_imx/mcimx7_m4/dts_fixup.h
View file

@ -8,9 +8,4 @@
#define DT_NUM_IRQ_PRIO_BITS DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
#define DT_IPM_IMX_MU_B_BASE_ADDRESS DT_NXP_IMX_MU_30AB0000_BASE_ADDRESS
#define DT_IPM_IMX_MU_B_IRQ DT_NXP_IMX_MU_30AB0000_IRQ_0
#define DT_IPM_IMX_MU_B_IRQ_PRI DT_NXP_IMX_MU_30AB0000_IRQ_0_PRIORITY
#define DT_IPM_IMX_MU_B_NAME DT_NXP_IMX_MU_30AB0000_LABEL
/* End of SoC Level DTS fixup file */ /* End of SoC Level DTS fixup file */