diff --git a/drivers/serial/uart_mcux_lpuart.c b/drivers/serial/uart_mcux_lpuart.c index 9509cba2508..5ebac996c07 100644 --- a/drivers/serial/uart_mcux_lpuart.c +++ b/drivers/serial/uart_mcux_lpuart.c @@ -289,11 +289,11 @@ static void mcux_lpuart_config_func_0(struct device *dev); #endif static const struct mcux_lpuart_config mcux_lpuart_0_config = { - .base = (LPUART_Type *) DT_UART_MCUX_LPUART_0_BASE_ADDRESS, - .clock_name = DT_UART_MCUX_LPUART_0_CLOCK_NAME, + .base = (LPUART_Type *) DT_NXP_KINETIS_LPUART_UART_0_BASE_ADDRESS, + .clock_name = DT_NXP_KINETIS_LPUART_UART_0_CLOCK_CONTROLLER, .clock_subsys = - (clock_control_subsys_t)DT_UART_MCUX_LPUART_0_CLOCK_SUBSYS, - .baud_rate = DT_UART_MCUX_LPUART_0_BAUD_RATE, + (clock_control_subsys_t)DT_NXP_KINETIS_LPUART_UART_0_CLOCK_NAME, + .baud_rate = DT_NXP_KINETIS_LPUART_UART_0_CURRENT_SPEED, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = mcux_lpuart_config_func_0, #endif @@ -301,7 +301,7 @@ static const struct mcux_lpuart_config mcux_lpuart_0_config = { static struct mcux_lpuart_data mcux_lpuart_0_data; -DEVICE_AND_API_INIT(uart_0, DT_UART_MCUX_LPUART_0_NAME, +DEVICE_AND_API_INIT(uart_0, DT_NXP_KINETIS_LPUART_UART_0_LABEL, &mcux_lpuart_init, &mcux_lpuart_0_data, &mcux_lpuart_0_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -310,19 +310,19 @@ DEVICE_AND_API_INIT(uart_0, DT_UART_MCUX_LPUART_0_NAME, #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void mcux_lpuart_config_func_0(struct device *dev) { - IRQ_CONNECT(DT_UART_MCUX_LPUART_0_IRQ_0, - DT_UART_MCUX_LPUART_0_IRQ_0_PRI, + IRQ_CONNECT(DT_NXP_KINETIS_LPUART_UART_0_IRQ_0, + DT_NXP_KINETIS_LPUART_UART_0_IRQ_0_PRIORITY, mcux_lpuart_isr, DEVICE_GET(uart_0), 0); - irq_enable(DT_UART_MCUX_LPUART_0_IRQ_0); + irq_enable(DT_NXP_KINETIS_LPUART_UART_0_IRQ_0); -#ifdef DT_UART_MCUX_LPUART_0_IRQ_1 - IRQ_CONNECT(DT_UART_MCUX_LPUART_0_IRQ_1, - DT_UART_MCUX_LPUART_0_IRQ_1_PRI, +#ifdef DT_NXP_KINETIS_LPUART_UART_0_IRQ_1 + IRQ_CONNECT(DT_NXP_KINETIS_LPUART_UART_0_IRQ_1, + DT_NXP_KINETIS_LPUART_UART_0_IRQ_1_PRIORITY, mcux_lpuart_isr, DEVICE_GET(uart_0), 0); - irq_enable(DT_UART_MCUX_LPUART_0_IRQ_1); -#endif /* DT_UART_MCUX_LPUART_0_IRQ_1 */ + irq_enable(DT_NXP_KINETIS_LPUART_UART_0_IRQ_1); +#endif /* DT_NXP_KINETIS_LPUART_UART_0_IRQ_1 */ } #endif @@ -335,11 +335,11 @@ static void mcux_lpuart_config_func_1(struct device *dev); #endif static const struct mcux_lpuart_config mcux_lpuart_1_config = { - .base = (LPUART_Type *) DT_UART_MCUX_LPUART_1_BASE_ADDRESS, - .clock_name = DT_UART_MCUX_LPUART_1_CLOCK_NAME, + .base = (LPUART_Type *) DT_NXP_KINETIS_LPUART_UART_1_BASE_ADDRESS, + .clock_name = DT_NXP_KINETIS_LPUART_UART_1_CLOCK_CONTROLLER, .clock_subsys = - (clock_control_subsys_t)DT_UART_MCUX_LPUART_1_CLOCK_SUBSYS, - .baud_rate = DT_UART_MCUX_LPUART_1_BAUD_RATE, + (clock_control_subsys_t)DT_NXP_KINETIS_LPUART_UART_1_CLOCK_NAME, + .baud_rate = DT_NXP_KINETIS_LPUART_UART_1_CURRENT_SPEED, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = mcux_lpuart_config_func_1, #endif @@ -347,7 +347,7 @@ static const struct mcux_lpuart_config mcux_lpuart_1_config = { static struct mcux_lpuart_data mcux_lpuart_1_data; -DEVICE_AND_API_INIT(uart_1, DT_UART_MCUX_LPUART_1_NAME, +DEVICE_AND_API_INIT(uart_1, DT_NXP_KINETIS_LPUART_UART_1_LABEL, &mcux_lpuart_init, &mcux_lpuart_1_data, &mcux_lpuart_1_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -356,19 +356,19 @@ DEVICE_AND_API_INIT(uart_1, DT_UART_MCUX_LPUART_1_NAME, #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void mcux_lpuart_config_func_1(struct device *dev) { - IRQ_CONNECT(DT_UART_MCUX_LPUART_1_IRQ_0, - DT_UART_MCUX_LPUART_1_IRQ_0_PRI, + IRQ_CONNECT(DT_NXP_KINETIS_LPUART_UART_1_IRQ_0, + DT_NXP_KINETIS_LPUART_UART_1_IRQ_0_PRIORITY, mcux_lpuart_isr, DEVICE_GET(uart_1), 0); - irq_enable(DT_UART_MCUX_LPUART_1_IRQ_0); + irq_enable(DT_NXP_KINETIS_LPUART_UART_1_IRQ_0); -#ifdef DT_UART_MCUX_LPUART_1_IRQ_1 - IRQ_CONNECT(DT_UART_MCUX_LPUART_1_IRQ_1, - DT_UART_MCUX_LPUART_1_IRQ_1_PRI, +#ifdef DT_NXP_KINETIS_LPUART_UART_1_IRQ_1 + IRQ_CONNECT(DT_NXP_KINETIS_LPUART_UART_1_IRQ_1, + DT_NXP_KINETIS_LPUART_UART_1_IRQ_1_PRIORITY, mcux_lpuart_isr, DEVICE_GET(uart_1), 0); - irq_enable(DT_UART_MCUX_LPUART_1_IRQ_1); -#endif /* DT_UART_MCUX_LPUART_1_IRQ_1 */ + irq_enable(DT_NXP_KINETIS_LPUART_UART_1_IRQ_1); +#endif /* DT_NXP_KINETIS_LPUART_UART_1_IRQ_1 */ } #endif @@ -381,11 +381,11 @@ static void mcux_lpuart_config_func_2(struct device *dev); #endif static const struct mcux_lpuart_config mcux_lpuart_2_config = { - .base = (LPUART_Type *) DT_UART_MCUX_LPUART_2_BASE_ADDRESS, - .clock_name = DT_UART_MCUX_LPUART_2_CLOCK_NAME, + .base = (LPUART_Type *) DT_NXP_KINETIS_LPUART_UART_2_BASE_ADDRESS, + .clock_name = DT_NXP_KINETIS_LPUART_UART_2_CLOCK_CONTROLLER, .clock_subsys = - (clock_control_subsys_t)DT_UART_MCUX_LPUART_2_CLOCK_SUBSYS, - .baud_rate = DT_UART_MCUX_LPUART_2_BAUD_RATE, + (clock_control_subsys_t)DT_NXP_KINETIS_LPUART_UART_2_CLOCK_NAME, + .baud_rate = DT_NXP_KINETIS_LPUART_UART_2_CURRENT_SPEED, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = mcux_lpuart_config_func_2, #endif @@ -393,7 +393,7 @@ static const struct mcux_lpuart_config mcux_lpuart_2_config = { static struct mcux_lpuart_data mcux_lpuart_2_data; -DEVICE_AND_API_INIT(uart_2, DT_UART_MCUX_LPUART_2_NAME, +DEVICE_AND_API_INIT(uart_2, DT_NXP_KINETIS_LPUART_UART_2_LABEL, &mcux_lpuart_init, &mcux_lpuart_2_data, &mcux_lpuart_2_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -402,19 +402,19 @@ DEVICE_AND_API_INIT(uart_2, DT_UART_MCUX_LPUART_2_NAME, #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void mcux_lpuart_config_func_2(struct device *dev) { - IRQ_CONNECT(DT_UART_MCUX_LPUART_2_IRQ_0, - DT_UART_MCUX_LPUART_2_IRQ_0_PRI, + IRQ_CONNECT(DT_NXP_KINETIS_LPUART_UART_2_IRQ_0, + DT_NXP_KINETIS_LPUART_UART_2_IRQ_0_PRIORITY, mcux_lpuart_isr, DEVICE_GET(uart_2), 0); - irq_enable(DT_UART_MCUX_LPUART_2_IRQ_0); + irq_enable(DT_NXP_KINETIS_LPUART_UART_2_IRQ_0); -#ifdef DT_UART_MCUX_LPUART_2_IRQ_1 - IRQ_CONNECT(DT_UART_MCUX_LPUART_2_IRQ_1, - DT_UART_MCUX_LPUART_2_IRQ_1_PRI, +#ifdef DT_NXP_KINETIS_LPUART_UART_2_IRQ_1 + IRQ_CONNECT(DT_NXP_KINETIS_LPUART_UART_2_IRQ_1, + DT_NXP_KINETIS_LPUART_UART_2_IRQ_1_PRIORITY, mcux_lpuart_isr, DEVICE_GET(uart_2), 0); - irq_enable(DT_UART_MCUX_LPUART_2_IRQ_1); -#endif /* DT_UART_MCUX_LPUART_2_IRQ_1 */ + irq_enable(DT_NXP_KINETIS_LPUART_UART_2_IRQ_1); +#endif /* DT_NXP_KINETIS_LPUART_UART_2_IRQ_1 */ } #endif @@ -427,11 +427,11 @@ static void mcux_lpuart_config_func_3(struct device *dev); #endif static const struct mcux_lpuart_config mcux_lpuart_3_config = { - .base = (LPUART_Type *) DT_UART_MCUX_LPUART_3_BASE_ADDRESS, - .clock_name = DT_UART_MCUX_LPUART_3_CLOCK_NAME, + .base = (LPUART_Type *) DT_NXP_KINETIS_LPUART_UART_3_BASE_ADDRESS, + .clock_name = DT_NXP_KINETIS_LPUART_UART_3_CLOCK_CONTROLLER, .clock_subsys = - (clock_control_subsys_t)DT_UART_MCUX_LPUART_3_CLOCK_SUBSYS, - .baud_rate = DT_UART_MCUX_LPUART_3_BAUD_RATE, + (clock_control_subsys_t)DT_NXP_KINETIS_LPUART_UART_3_CLOCK_NAME, + .baud_rate = DT_NXP_KINETIS_LPUART_UART_3_CURRENT_SPEED, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = mcux_lpuart_config_func_3, #endif @@ -439,7 +439,7 @@ static const struct mcux_lpuart_config mcux_lpuart_3_config = { static struct mcux_lpuart_data mcux_lpuart_3_data; -DEVICE_AND_API_INIT(uart_3, DT_UART_MCUX_LPUART_3_NAME, +DEVICE_AND_API_INIT(uart_3, DT_NXP_KINETIS_LPUART_UART_3_LABEL, &mcux_lpuart_init, &mcux_lpuart_3_data, &mcux_lpuart_3_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -448,19 +448,19 @@ DEVICE_AND_API_INIT(uart_3, DT_UART_MCUX_LPUART_3_NAME, #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void mcux_lpuart_config_func_3(struct device *dev) { - IRQ_CONNECT(DT_UART_MCUX_LPUART_3_IRQ_0, - DT_UART_MCUX_LPUART_3_IRQ_0_PRI, + IRQ_CONNECT(DT_NXP_KINETIS_LPUART_UART_3_IRQ_0, + DT_NXP_KINETIS_LPUART_UART_3_IRQ_0_PRIORITY, mcux_lpuart_isr, DEVICE_GET(uart_3), 0); - irq_enable(DT_UART_MCUX_LPUART_3_IRQ_0); + irq_enable(DT_NXP_KINETIS_LPUART_UART_3_IRQ_0); -#ifdef DT_UART_MCUX_LPUART_3_IRQ_1 - IRQ_CONNECT(DT_UART_MCUX_LPUART_3_IRQ_1, - DT_UART_MCUX_LPUART_3_IRQ_1_PRI, +#ifdef DT_NXP_KINETIS_LPUART_UART_3_IRQ_1 + IRQ_CONNECT(DT_NXP_KINETIS_LPUART_UART_3_IRQ_1, + DT_NXP_KINETIS_LPUART_UART_3_IRQ_1_PRIORITY, mcux_lpuart_isr, DEVICE_GET(uart_3), 0); - irq_enable(DT_UART_MCUX_LPUART_3_IRQ_1); -#endif /* DT_UART_MCUX_LPUART_3_IRQ_1 */ + irq_enable(DT_NXP_KINETIS_LPUART_UART_3_IRQ_1); +#endif /* DT_NXP_KINETIS_LPUART_UART_3_IRQ_1 */ } #endif @@ -473,11 +473,11 @@ static void mcux_lpuart_config_func_4(struct device *dev); #endif static const struct mcux_lpuart_config mcux_lpuart_4_config = { - .base = (LPUART_Type *) DT_UART_MCUX_LPUART_4_BASE_ADDRESS, - .clock_name = DT_UART_MCUX_LPUART_4_CLOCK_NAME, + .base = (LPUART_Type *) DT_NXP_KINETIS_LPUART_UART_4_BASE_ADDRESS, + .clock_name = DT_NXP_KINETIS_LPUART_UART_4_CLOCK_CONTROLLER, .clock_subsys = - (clock_control_subsys_t)DT_UART_MCUX_LPUART_4_CLOCK_SUBSYS, - .baud_rate = DT_UART_MCUX_LPUART_4_BAUD_RATE, + (clock_control_subsys_t)DT_NXP_KINETIS_LPUART_UART_4_CLOCK_NAME, + .baud_rate = DT_NXP_KINETIS_LPUART_UART_4_CURRENT_SPEED, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = mcux_lpuart_config_func_4, #endif @@ -485,7 +485,7 @@ static const struct mcux_lpuart_config mcux_lpuart_4_config = { static struct mcux_lpuart_data mcux_lpuart_4_data; -DEVICE_AND_API_INIT(uart_4, DT_UART_MCUX_LPUART_4_NAME, +DEVICE_AND_API_INIT(uart_4, DT_NXP_KINETIS_LPUART_UART_4_LABEL, &mcux_lpuart_init, &mcux_lpuart_4_data, &mcux_lpuart_4_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -494,19 +494,19 @@ DEVICE_AND_API_INIT(uart_4, DT_UART_MCUX_LPUART_4_NAME, #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void mcux_lpuart_config_func_4(struct device *dev) { - IRQ_CONNECT(DT_UART_MCUX_LPUART_4_IRQ_0, - DT_UART_MCUX_LPUART_4_IRQ_0_PRI, + IRQ_CONNECT(DT_NXP_KINETIS_LPUART_UART_4_IRQ_0, + DT_NXP_KINETIS_LPUART_UART_4_IRQ_0_PRIORITY, mcux_lpuart_isr, DEVICE_GET(uart_4), 0); - irq_enable(DT_UART_MCUX_LPUART_4_IRQ_0); + irq_enable(DT_NXP_KINETIS_LPUART_UART_4_IRQ_0); -#ifdef DT_UART_MCUX_LPUART_4_IRQ_1 - IRQ_CONNECT(DT_UART_MCUX_LPUART_4_IRQ_1, - DT_UART_MCUX_LPUART_4_IRQ_1_PRI, +#ifdef DT_NXP_KINETIS_LPUART_UART_4_IRQ_1 + IRQ_CONNECT(DT_NXP_KINETIS_LPUART_UART_4_IRQ_1, + DT_NXP_KINETIS_LPUART_UART_4_IRQ_1_PRIORITY, mcux_lpuart_isr, DEVICE_GET(uart_4), 0); - irq_enable(DT_UART_MCUX_LPUART_4_IRQ_1); -#endif /* DT_UART_MCUX_LPUART_4_IRQ_1 */ + irq_enable(DT_NXP_KINETIS_LPUART_UART_4_IRQ_1); +#endif /* DT_NXP_KINETIS_LPUART_UART_4_IRQ_1 */ } #endif diff --git a/soc/arm/nxp_imx/rt/dts_fixup.h b/soc/arm/nxp_imx/rt/dts_fixup.h index 95515a45ca0..43ef62df123 100644 --- a/soc/arm/nxp_imx/rt/dts_fixup.h +++ b/soc/arm/nxp_imx/rt/dts_fixup.h @@ -55,30 +55,6 @@ #define DT_MCUX_IGPIO_5_IRQ_1 DT_NXP_IMX_GPIO_400C0000_IRQ_1 #define DT_MCUX_IGPIO_5_IRQ_1_PRI DT_NXP_IMX_GPIO_400C0000_IRQ_1_PRIORITY -#define DT_UART_MCUX_LPUART_1_BASE_ADDRESS DT_NXP_KINETIS_LPUART_40184000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_1_NAME DT_NXP_KINETIS_LPUART_40184000_LABEL -#define DT_UART_MCUX_LPUART_1_IRQ_0 DT_NXP_KINETIS_LPUART_40184000_IRQ_0 -#define DT_UART_MCUX_LPUART_1_IRQ_0_PRI DT_NXP_KINETIS_LPUART_40184000_IRQ_0_PRIORITY -#define DT_UART_MCUX_LPUART_1_BAUD_RATE DT_NXP_KINETIS_LPUART_40184000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_1_CLOCK_NAME DT_NXP_KINETIS_LPUART_40184000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_1_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_40184000_CLOCK_NAME - -#define DT_UART_MCUX_LPUART_2_BASE_ADDRESS DT_NXP_KINETIS_LPUART_40188000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_2_NAME DT_NXP_KINETIS_LPUART_40188000_LABEL -#define DT_UART_MCUX_LPUART_2_IRQ_0 DT_NXP_KINETIS_LPUART_40188000_IRQ_0 -#define DT_UART_MCUX_LPUART_2_IRQ_0_PRI DT_NXP_KINETIS_LPUART_40188000_IRQ_0_PRIORITY -#define DT_UART_MCUX_LPUART_2_BAUD_RATE DT_NXP_KINETIS_LPUART_40188000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_2_CLOCK_NAME DT_NXP_KINETIS_LPUART_40188000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_2_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_40188000_CLOCK_NAME - -#define DT_UART_MCUX_LPUART_3_BASE_ADDRESS DT_NXP_KINETIS_LPUART_4018C000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_3_NAME DT_NXP_KINETIS_LPUART_4018C000_LABEL -#define DT_UART_MCUX_LPUART_3_IRQ_0 DT_NXP_KINETIS_LPUART_4018C000_IRQ_0 -#define DT_UART_MCUX_LPUART_3_IRQ_0_PRI DT_NXP_KINETIS_LPUART_4018C000_IRQ_0_PRIORITY -#define DT_UART_MCUX_LPUART_3_BAUD_RATE DT_NXP_KINETIS_LPUART_4018C000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_3_CLOCK_NAME DT_NXP_KINETIS_LPUART_4018C000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_3_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_4018C000_CLOCK_NAME - #define DT_COUNTER_MCUX_GPT_1_BASE_ADDRESS DT_NXP_IMX_GPT_401EC000_BASE_ADDRESS #define DT_COUNTER_MCUX_GPT_1_IRQ DT_NXP_IMX_GPT_401EC000_IRQ_0 #define DT_COUNTER_MCUX_GPT_1_IRQ_PRI DT_NXP_IMX_GPT_401EC000_IRQ_0_PRIORITY diff --git a/soc/arm/nxp_kinetis/k8x/dts_fixup.h b/soc/arm/nxp_kinetis/k8x/dts_fixup.h index 7627c61d017..7ab7fac482e 100644 --- a/soc/arm/nxp_kinetis/k8x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k8x/dts_fixup.h @@ -82,46 +82,6 @@ #define DT_SPI_2_CLOCK_NAME DT_NXP_KINETIS_DSPI_400AC000_CLOCK_CONTROLLER #define DT_SPI_2_CLOCK_SUBSYS DT_NXP_KINETIS_DSPI_400AC000_CLOCK_NAME -#define DT_UART_MCUX_LPUART_0_BASE_ADDRESS DT_NXP_KINETIS_LPUART_400C4000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_0_BAUD_RATE DT_NXP_KINETIS_LPUART_400C4000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_0_IRQ_0 DT_NXP_KINETIS_LPUART_400C4000_IRQ_0 -#define DT_UART_MCUX_LPUART_0_IRQ_0_PRI DT_NXP_KINETIS_LPUART_400C4000_IRQ_0_PRIORITY -#define DT_UART_MCUX_LPUART_0_NAME DT_NXP_KINETIS_LPUART_400C4000_LABEL -#define DT_UART_MCUX_LPUART_0_CLOCK_NAME DT_NXP_KINETIS_LPUART_400C4000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_0_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_400C4000_CLOCK_NAME - -#define DT_UART_MCUX_LPUART_1_BASE_ADDRESS DT_NXP_KINETIS_LPUART_400C5000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_1_BAUD_RATE DT_NXP_KINETIS_LPUART_400C5000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_1_IRQ_0 DT_NXP_KINETIS_LPUART_400C5000_IRQ_0 -#define DT_UART_MCUX_LPUART_1_IRQ_0_PRI DT_NXP_KINETIS_LPUART_400C5000_IRQ_0_PRIORITY -#define DT_UART_MCUX_LPUART_1_NAME DT_NXP_KINETIS_LPUART_400C5000_LABEL -#define DT_UART_MCUX_LPUART_1_CLOCK_NAME DT_NXP_KINETIS_LPUART_400C5000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_1_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_400C5000_CLOCK_NAME - -#define DT_UART_MCUX_LPUART_2_BASE_ADDRESS DT_NXP_KINETIS_LPUART_400C6000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_2_BAUD_RATE DT_NXP_KINETIS_LPUART_400C6000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_2_IRQ_0 DT_NXP_KINETIS_LPUART_400C6000_IRQ_0 -#define DT_UART_MCUX_LPUART_2_IRQ_0_PRI DT_NXP_KINETIS_LPUART_400C6000_IRQ_0_PRIORITY -#define DT_UART_MCUX_LPUART_2_NAME DT_NXP_KINETIS_LPUART_400C6000_LABEL -#define DT_UART_MCUX_LPUART_2_CLOCK_NAME DT_NXP_KINETIS_LPUART_400C6000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_2_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_400C6000_CLOCK_NAME - -#define DT_UART_MCUX_LPUART_3_BASE_ADDRESS DT_NXP_KINETIS_LPUART_400C7000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_3_BAUD_RATE DT_NXP_KINETIS_LPUART_400C7000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_3_IRQ_0 DT_NXP_KINETIS_LPUART_400C7000_IRQ_0 -#define DT_UART_MCUX_LPUART_3_IRQ_0_PRI DT_NXP_KINETIS_LPUART_400C7000_IRQ_0_PRIORITY -#define DT_UART_MCUX_LPUART_3_NAME DT_NXP_KINETIS_LPUART_400C7000_LABEL -#define DT_UART_MCUX_LPUART_3_CLOCK_NAME DT_NXP_KINETIS_LPUART_400C7000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_3_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_400C7000_CLOCK_NAME - -#define DT_UART_MCUX_LPUART_4_BASE_ADDRESS DT_NXP_KINETIS_LPUART_400D6000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_4_BAUD_RATE DT_NXP_KINETIS_LPUART_400D6000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_4_IRQ_0 DT_NXP_KINETIS_LPUART_400D6000_IRQ_0 -#define DT_UART_MCUX_LPUART_4_IRQ_0_PRI DT_NXP_KINETIS_LPUART_400D6000_IRQ_0_PRIORITY -#define DT_UART_MCUX_LPUART_4_NAME DT_NXP_KINETIS_LPUART_400D6000_LABEL -#define DT_UART_MCUX_LPUART_4_CLOCK_NAME DT_NXP_KINETIS_LPUART_400D6000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_4_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_400D6000_CLOCK_NAME - #define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL #define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG #define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY diff --git a/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h b/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h index fdb587da634..9bfbdb9d653 100644 --- a/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h +++ b/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h @@ -27,39 +27,6 @@ #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFE_40020000_LABEL -#define DT_UART_MCUX_LPUART_0_BASE_ADDRESS DT_NXP_KINETIS_LPUART_4006A000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_0_BAUD_RATE DT_NXP_KINETIS_LPUART_4006A000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_0_NAME DT_NXP_KINETIS_LPUART_4006A000_LABEL -#define DT_UART_MCUX_LPUART_0_IRQ_0 DT_NXP_KINETIS_LPUART_4006A000_IRQ_RECEIVE -#define DT_UART_MCUX_LPUART_0_IRQ_0_PRI DT_NXP_KINETIS_LPUART_4006A000_IRQ_RECEIVE_PRIORITY -#define DT_UART_MCUX_LPUART_0_IRQ_1 DT_NXP_KINETIS_LPUART_4006A000_IRQ_TRANSMIT -#define DT_UART_MCUX_LPUART_0_IRQ_1_PRI DT_NXP_KINETIS_LPUART_4006A000_IRQ_TRANSMIT_PRIORITY -#define DT_UART_MCUX_LPUART_0_HW_FLOW_CONTROL DT_NXP_KINETIS_LPUART_4006A000_HW_FLOW_CONTROL -#define DT_UART_MCUX_LPUART_0_CLOCK_NAME DT_NXP_KINETIS_LPUART_4006A000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_0_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_4006A000_CLOCK_NAME - -#define DT_UART_MCUX_LPUART_1_BASE_ADDRESS DT_NXP_KINETIS_LPUART_4006B000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_1_BAUD_RATE DT_NXP_KINETIS_LPUART_4006B000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_1_NAME DT_NXP_KINETIS_LPUART_4006B000_LABEL -#define DT_UART_MCUX_LPUART_1_IRQ_0 DT_NXP_KINETIS_LPUART_4006B000_IRQ_RECEIVE -#define DT_UART_MCUX_LPUART_1_IRQ_0_PRI DT_NXP_KINETIS_LPUART_4006B000_IRQ_RECEIVE_PRIORITY -#define DT_UART_MCUX_LPUART_1_IRQ_1 DT_NXP_KINETIS_LPUART_4006B000_IRQ_TRANSMIT -#define DT_UART_MCUX_LPUART_1_IRQ_1_PRI DT_NXP_KINETIS_LPUART_4006B000_IRQ_TRANSMIT_PRIORITY -#define DT_UART_MCUX_LPUART_1_HW_FLOW_CONTROL DT_NXP_KINETIS_LPUART_4006B000_HW_FLOW_CONTROL -#define DT_UART_MCUX_LPUART_1_CLOCK_NAME DT_NXP_KINETIS_LPUART_4006B000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_1_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_4006B000_CLOCK_NAME - -#define DT_UART_MCUX_LPUART_2_BASE_ADDRESS DT_NXP_KINETIS_LPUART_4006C000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_2_BAUD_RATE DT_NXP_KINETIS_LPUART_4006C000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_2_NAME DT_NXP_KINETIS_LPUART_4006C000_LABEL -#define DT_UART_MCUX_LPUART_2_IRQ_0 DT_NXP_KINETIS_LPUART_4006C000_IRQ_RECEIVE -#define DT_UART_MCUX_LPUART_2_IRQ_0_PRI DT_NXP_KINETIS_LPUART_4006C000_IRQ_RECEIVE_PRIORITY -#define DT_UART_MCUX_LPUART_2_IRQ_1 DT_NXP_KINETIS_LPUART_4006C000_IRQ_TRANSMIT -#define DT_UART_MCUX_LPUART_2_IRQ_1_PRI DT_NXP_KINETIS_LPUART_4006C000_IRQ_TRANSMIT_PRIORITY -#define DT_UART_MCUX_LPUART_2_HW_FLOW_CONTROL DT_NXP_KINETIS_LPUART_4006C000_HW_FLOW_CONTROL -#define DT_UART_MCUX_LPUART_2_CLOCK_NAME DT_NXP_KINETIS_LPUART_4006C000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_2_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_4006C000_CLOCK_NAME - #define DT_ADC_0_NAME DT_NXP_KINETIS_ADC12_4003B000_LABEL #define DT_ADC_1_NAME DT_NXP_KINETIS_ADC12_40027000_LABEL #define DT_ADC_2_NAME DT_NXP_KINETIS_ADC12_4003C000_LABEL diff --git a/soc/arm/nxp_kinetis/kwx/dts_fixup.h b/soc/arm/nxp_kinetis/kwx/dts_fixup.h index 3db747208b6..71d07cef634 100644 --- a/soc/arm/nxp_kinetis/kwx/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kwx/dts_fixup.h @@ -111,14 +111,6 @@ #if defined(CONFIG_SOC_MKW40Z4) || defined(CONFIG_SOC_MKW41Z4) #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define DT_UART_MCUX_LPUART_0_BASE_ADDRESS DT_NXP_KINETIS_LPUART_40054000_BASE_ADDRESS -#define DT_UART_MCUX_LPUART_0_BAUD_RATE DT_NXP_KINETIS_LPUART_40054000_CURRENT_SPEED -#define DT_UART_MCUX_LPUART_0_IRQ_0 DT_NXP_KINETIS_LPUART_40054000_IRQ_0 -#define DT_UART_MCUX_LPUART_0_IRQ_0_PRI DT_NXP_KINETIS_LPUART_40054000_IRQ_0_PRIORITY -#define DT_UART_MCUX_LPUART_0_NAME DT_NXP_KINETIS_LPUART_40054000_LABEL -#define DT_UART_MCUX_LPUART_0_CLOCK_NAME DT_NXP_KINETIS_LPUART_40054000_CLOCK_CONTROLLER -#define DT_UART_MCUX_LPUART_0_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_40054000_CLOCK_NAME - #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFA_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFA_40020000_LABEL