michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: uart: mcux_lpuart: Convert to DT_INST

Browse source 
Convert driver to use new DT_INST macros throughout.  Removed per
instance Kconfig symbols and replaced with DT_NODELABEL references
where needed.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-04-19 10:00:26 -05:00 • committed by Maureen Helm
commit 9a65318a5b
14 changed files with 55 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/arm/frdm_k82f/Kconfig.defconfig
View file

@ -84,8 +84,4 @@ config SPI_1
default y default y
depends on SPI depends on SPI
config UART_MCUX_LPUART_4
default y if UART_CONSOLE
depends on UART_MCUX_LPUART
endif # BOARD_FRDM_K82F endif # BOARD_FRDM_K82F

4
boards/arm/frdm_kw41z/Kconfig.defconfig
View file

@ -43,10 +43,6 @@ config GPIO_MCUX_PORTC
endif # GPIO_MCUX endif # GPIO_MCUX
config UART_MCUX_LPUART_0
default y if UART_CONSOLE
depends on UART_MCUX_LPUART
config I2C_1 config I2C_1
default y default y
depends on I2C depends on I2C

6
boards/arm/hexiwear_kw40z/Kconfig.defconfig
View file

@ -39,14 +39,10 @@ config GPIO_MCUX_PORTB
default n default n
config GPIO_MCUX_PORTC config GPIO_MCUX_PORTC
default y if UART_MCUX_LPUART_0 || I2C_1 default y if "$(dt_nodelabel_enabled,lpuart0)" || "$(dt_nodelabel_enabled,i2c1)"
endif # GPIO_MCUX endif # GPIO_MCUX
config UART_MCUX_LPUART_0
default y
depends on UART_MCUX_LPUART
config I2C_1 config I2C_1
default y default y
depends on I2C depends on I2C

4
boards/arm/mimxrt1010_evk/Kconfig.defconfig
View file

@ -16,8 +16,4 @@ config I2C_1
default y default y
depends on I2C_MCUX_LPI2C depends on I2C_MCUX_LPI2C
config UART_MCUX_LPUART_1
default y
depends on UART_MCUX_LPUART
endif # BOARD_MIMXRT1010_EVK endif # BOARD_MIMXRT1010_EVK

10
boards/arm/mimxrt1015_evk/Kconfig.defconfig
View file

@ -16,14 +16,4 @@ config I2C_1
default y default y
depends on I2C_MCUX_LPI2C depends on I2C_MCUX_LPI2C
if UART_MCUX_LPUART
config UART_MCUX_LPUART_1
default y
config UART_MCUX_LPUART_4
default y if BT_UART
endif # UART_MCUX_LPUART
endif # BOARD_MIMXRT1015_EVK endif # BOARD_MIMXRT1015_EVK

10
boards/arm/mimxrt1020_evk/Kconfig.defconfig
View file

@ -26,16 +26,6 @@ config I2C_4
endif # I2C_MCUX_LPI2C endif # I2C_MCUX_LPI2C
if UART_MCUX_LPUART
config UART_MCUX_LPUART_1
default y
config UART_MCUX_LPUART_2
default y if BT_UART
endif # UART_MCUX_LPUART
if NETWORKING if NETWORKING
config NET_L2_ETHERNET config NET_L2_ETHERNET

10
boards/arm/mimxrt1050_evk/Kconfig.defconfig
View file

@ -31,16 +31,6 @@ config SPI_3
default y default y
depends on SPI_MCUX_LPSPI depends on SPI_MCUX_LPSPI
if UART_MCUX_LPUART
config UART_MCUX_LPUART_1
default y
config UART_MCUX_LPUART_3
default y if BT_UART
endif # UART_MCUX_LPUART
config KSCAN config KSCAN
default y if LVGL default y if LVGL

10
boards/arm/mimxrt1060_evk/Kconfig.defconfig
View file

@ -24,16 +24,6 @@ config I2C_1
default y default y
depends on I2C_MCUX_LPI2C depends on I2C_MCUX_LPI2C
if UART_MCUX_LPUART
config UART_MCUX_LPUART_1
default y
config UART_MCUX_LPUART_3
default y if BT_UART
endif # UART_MCUX_LPUART
config KSCAN config KSCAN
default y if LVGL default y if LVGL

4
boards/arm/mimxrt1064_evk/Kconfig.defconfig
View file

@ -23,10 +23,6 @@ config I2C_1
default y default y
depends on I2C_MCUX_LPI2C depends on I2C_MCUX_LPI2C
config UART_MCUX_LPUART_1
default y
depends on UART_MCUX_LPUART
config KSCAN config KSCAN
default y if LVGL default y if LVGL

4
boards/arm/mm_swiftio/Kconfig.defconfig
View file

@ -20,8 +20,4 @@ config DISK_ACCESS_USDHC1
default y default y
depends on DISK_ACCESS_USDHC depends on DISK_ACCESS_USDHC
config UART_MCUX_LPUART_1
default y
depends on UART_MCUX_LPUART
endif # BOARD_MM_SWIFTIO endif # BOARD_MM_SWIFTIO

4
boards/arm/twr_ke18f/Kconfig.defconfig
View file

@ -8,10 +8,6 @@ if BOARD_TWR_KE18F
config BOARD config BOARD
default "twr_ke18f" default "twr_ke18f"
config UART_MCUX_LPUART_0
default y if UART_CONSOLE
depends on UART_MCUX_LPUART
if I2C if I2C
config I2C_0 config I2C_0

31
drivers/serial/Kconfig.mcux_lpuart
View file

@ -3,39 +3,10 @@
# Copyright (c) 2017, NXP # Copyright (c) 2017, NXP
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
menuconfig UART_MCUX_LPUART config UART_MCUX_LPUART
bool "MCUX LPUART driver" bool "MCUX LPUART driver"
depends on HAS_MCUX_LPUART && CLOCK_CONTROL depends on HAS_MCUX_LPUART && CLOCK_CONTROL
select SERIAL_HAS_DRIVER select SERIAL_HAS_DRIVER
select SERIAL_SUPPORT_INTERRUPT select SERIAL_SUPPORT_INTERRUPT
help help
Enable the MCUX LPUART driver. Enable the MCUX LPUART driver.
if UART_MCUX_LPUART
config UART_MCUX_LPUART_0
bool "UART 0"
help
Enable UART 0.
config UART_MCUX_LPUART_1
bool "UART 1"
help
Enable UART 1.
config UART_MCUX_LPUART_2
bool "UART 2"
help
Enable UART 2.
config UART_MCUX_LPUART_3
bool "UART 3"
help
Enable UART 3.
config UART_MCUX_LPUART_4
bool "UART 4"
help
Enable UART 4.
endif # UART_MCUX_LPUART

274
drivers/serial/uart_mcux_lpuart.c
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#define DT_DRV_COMPAT nxp_kinetis_lpuart
#include <errno.h> #include <errno.h>
#include <soc.h> #include <soc.h>
#include <fsl_lpuart.h> #include <fsl_lpuart.h>
@ -282,232 +284,60 @@ static const struct uart_driver_api mcux_lpuart_driver_api = {
#endif #endif
}; };
#ifdef CONFIG_UART_MCUX_LPUART_0
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpuart_config_func_0(struct device *dev); #define MCUX_LPUART_IRQ_INIT(n, i) \
do { \
IRQ_CONNECT(DT_INST_IRQ_BY_IDX(n, i, irq), \
DT_INST_IRQ_BY_IDX(n, i, priority), \
mcux_lpuart_isr, DEVICE_GET(uart_##n), 0); \
\
irq_enable(DT_INST_IRQ_BY_IDX(n, i, irq)); \
} while (1)
#define LPUART_MCUX_CONFIG_FUNC(n) \
static void mcux_lpuart_config_func_##n(struct device *dev) \
{ \
MCUX_LPUART_IRQ_INIT(n, 0); \
\
IF_ENABLED(DT_INST_IRQ_HAS_IDX(n, 1), \
(MCUX_LPUART_IRQ_INIT(n, 1);)) \
}
#define LPUART_MCUX_IRQ_CFG_FUNC_INIT(n) \
.irq_config_func = mcux_lpuart_config_func_##n
#define LPUART_MCUX_INIT_CFG(n) \
LPUART_MCUX_DECLARE_CFG(n, LPUART_MCUX_IRQ_CFG_FUNC_INIT(n))
#else
#define LPUART_MCUX_CONFIG_FUNC(n)
#define LPUART_MCUX_IRQ_CFG_FUNC_INIT
#define LPUART_MCUX_INIT_CFG(n) \
LPUART_MCUX_DECLARE_CFG(n, LPUART_MCUX_IRQ_CFG_FUNC_INIT)
#endif #endif
static const struct mcux_lpuart_config mcux_lpuart_0_config = { #define LPUART_MCUX_DECLARE_CFG(n, IRQ_FUNC_INIT) \
.base = (LPUART_Type *) DT_NXP_KINETIS_LPUART_UART_0_BASE_ADDRESS, static const struct mcux_lpuart_config mcux_lpuart_##n##_config = { \
.clock_name = DT_NXP_KINETIS_LPUART_UART_0_CLOCK_CONTROLLER, .base = (LPUART_Type *) DT_INST_REG_ADDR(n), \
.clock_subsys = .clock_name = DT_INST_CLOCKS_LABEL(n), \
(clock_control_subsys_t)DT_NXP_KINETIS_LPUART_UART_0_CLOCK_NAME, .clock_subsys = (clock_control_subsys_t)DT_INST_CLOCKS_CELL(n, name),\
.baud_rate = DT_NXP_KINETIS_LPUART_UART_0_CURRENT_SPEED, .baud_rate = DT_INST_PROP(n, current_speed), \
#ifdef CONFIG_UART_INTERRUPT_DRIVEN IRQ_FUNC_INIT \
.irq_config_func = mcux_lpuart_config_func_0,
#endif
};
static struct mcux_lpuart_data mcux_lpuart_0_data;
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,
&mcux_lpuart_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpuart_config_func_0(struct device *dev)
{
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_NXP_KINETIS_LPUART_UART_0_IRQ_0);
#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_NXP_KINETIS_LPUART_UART_0_IRQ_1);
#endif /* DT_NXP_KINETIS_LPUART_UART_0_IRQ_1 */
} }
#endif
#endif /* CONFIG_UART_MCUX_LPUART_0 */ #define LPUART_MCUX_INIT(n) \
\
static struct mcux_lpuart_data mcux_lpuart_##n##_data; \
\
static const struct mcux_lpuart_config mcux_lpuart_##n##_config;\
\
DEVICE_AND_API_INIT(uart_##n, DT_INST_LABEL(n), \
&mcux_lpuart_init, \
&mcux_lpuart_##n##_data, \
&mcux_lpuart_##n##_config, \
PRE_KERNEL_1, \
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \
&mcux_lpuart_driver_api); \
\
LPUART_MCUX_CONFIG_FUNC(n) \
\
LPUART_MCUX_INIT_CFG(n)
#ifdef CONFIG_UART_MCUX_LPUART_1 DT_INST_FOREACH(LPUART_MCUX_INIT)
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
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_NXP_KINETIS_LPUART_UART_1_BASE_ADDRESS,
.clock_name = DT_NXP_KINETIS_LPUART_UART_1_CLOCK_CONTROLLER,
.clock_subsys =
(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
};
static struct mcux_lpuart_data mcux_lpuart_1_data;
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,
&mcux_lpuart_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpuart_config_func_1(struct device *dev)
{
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_NXP_KINETIS_LPUART_UART_1_IRQ_0);
#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_NXP_KINETIS_LPUART_UART_1_IRQ_1);
#endif /* DT_NXP_KINETIS_LPUART_UART_1_IRQ_1 */
}
#endif
#endif /* CONFIG_UART_MCUX_LPUART_1 */
#ifdef CONFIG_UART_MCUX_LPUART_2
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
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_NXP_KINETIS_LPUART_UART_2_BASE_ADDRESS,
.clock_name = DT_NXP_KINETIS_LPUART_UART_2_CLOCK_CONTROLLER,
.clock_subsys =
(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
};
static struct mcux_lpuart_data mcux_lpuart_2_data;
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,
&mcux_lpuart_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpuart_config_func_2(struct device *dev)
{
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_NXP_KINETIS_LPUART_UART_2_IRQ_0);
#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_NXP_KINETIS_LPUART_UART_2_IRQ_1);
#endif /* DT_NXP_KINETIS_LPUART_UART_2_IRQ_1 */
}
#endif
#endif /* CONFIG_UART_MCUX_LPUART_2 */
#ifdef CONFIG_UART_MCUX_LPUART_3
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
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_NXP_KINETIS_LPUART_UART_3_BASE_ADDRESS,
.clock_name = DT_NXP_KINETIS_LPUART_UART_3_CLOCK_CONTROLLER,
.clock_subsys =
(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
};
static struct mcux_lpuart_data mcux_lpuart_3_data;
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,
&mcux_lpuart_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpuart_config_func_3(struct device *dev)
{
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_NXP_KINETIS_LPUART_UART_3_IRQ_0);
#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_NXP_KINETIS_LPUART_UART_3_IRQ_1);
#endif /* DT_NXP_KINETIS_LPUART_UART_3_IRQ_1 */
}
#endif
#endif /* CONFIG_UART_MCUX_LPUART_3 */
#ifdef CONFIG_UART_MCUX_LPUART_4
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
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_NXP_KINETIS_LPUART_UART_4_BASE_ADDRESS,
.clock_name = DT_NXP_KINETIS_LPUART_UART_4_CLOCK_CONTROLLER,
.clock_subsys =
(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
};
static struct mcux_lpuart_data mcux_lpuart_4_data;
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,
&mcux_lpuart_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpuart_config_func_4(struct device *dev)
{
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_NXP_KINETIS_LPUART_UART_4_IRQ_0);
#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_NXP_KINETIS_LPUART_UART_4_IRQ_1);
#endif /* DT_NXP_KINETIS_LPUART_UART_4_IRQ_1 */
}
#endif
#endif /* CONFIG_UART_MCUX_LPUART_4 */

2
soc/arm/nxp_kinetis/kwx/soc_kw4xz.c
View file

@ -66,7 +66,7 @@ static ALWAYS_INLINE void clock_init(void)
CLOCK_SetSimConfig(&simConfig); CLOCK_SetSimConfig(&simConfig);
#if CONFIG_UART_MCUX_LPUART_0 #if DT_HAS_NODE(DT_NODELABEL(lpuart0))
CLOCK_SetLpuartClock(LPUART0SRC_OSCERCLK); CLOCK_SetLpuartClock(LPUART0SRC_OSCERCLK);
#endif #endif
} }