patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

drivers: serial: uart_mcux: 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-03-31 21:55:27 -05:00 committed by Kumar Gala
parent 242b13cc8d
commit 5a149dfca6
10 changed files with 58 additions and 342 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,10 +20,6 @@ config MCG_VDIV0
config MCG_FCRDIV config MCG_FCRDIV
default 0 default 0
config UART_MCUX_1
default y if UART_CONSOLE
depends on UART_MCUX
if PINMUX_MCUX if PINMUX_MCUX
config PINMUX_MCUX_PORTA config PINMUX_MCUX_PORTA
@ -39,7 +35,7 @@ config PINMUX_MCUX_PORTD
default y default y
config PINMUX_MCUX_PORTE config PINMUX_MCUX_PORTE
default y if UART_MCUX_1 default y if "$(dt_nodelabel_enabled,uart1)"
endif # PINMUX_MCUX endif # PINMUX_MCUX

12
boards/arm/frdm_k64f/Kconfig.defconfig
View file

@ -20,16 +20,6 @@ config MCG_VDIV0
config MCG_FCRDIV config MCG_FCRDIV
default 1 default 1
if UART_MCUX
config UART_MCUX_0
default y if UART_CONSOLE
config UART_MCUX_3
default y if BT_UART
endif # UART_MCUX
if PINMUX_MCUX if PINMUX_MCUX
config PINMUX_MCUX_PORTA config PINMUX_MCUX_PORTA
@ -42,7 +32,7 @@ config PINMUX_MCUX_PORTC
default y default y
config PINMUX_MCUX_PORTD config PINMUX_MCUX_PORTD
default y if SPI_0 || UART_MCUX_2 default y if SPI_0 || "$(dt_nodelabel_enabled,uart2)"
config PINMUX_MCUX_PORTE config PINMUX_MCUX_PORTE
default y default y

14
boards/arm/hexiwear_k64/Kconfig.defconfig
View file

@ -20,23 +20,13 @@ config MCG_VDIV0
config MCG_FCRDIV config MCG_FCRDIV
default 1 default 1
if UART_MCUX
config UART_MCUX_0
default y if UART_CONSOLE
config UART_MCUX_4
default y if BT_UART
endif # UART_MCUX
if PINMUX_MCUX if PINMUX_MCUX
config PINMUX_MCUX_PORTA config PINMUX_MCUX_PORTA
default y if MAX30101 default y if MAX30101
config PINMUX_MCUX_PORTB config PINMUX_MCUX_PORTB
default y if UART_MCUX_0 default y if "$(dt_nodelabel_enabled,uart0)"
config PINMUX_MCUX_PORTC config PINMUX_MCUX_PORTC
default y default y
@ -45,7 +35,7 @@ config PINMUX_MCUX_PORTD
default y default y
config PINMUX_MCUX_PORTE config PINMUX_MCUX_PORTE
default y if UART_MCUX_4 default y if "$(dt_nodelabel_enabled,uart4)"
endif # PINMUX_MCUX endif # PINMUX_MCUX

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

@ -62,8 +62,4 @@ config PINMUX_MCUX_PORTE
endif # PINMUX_MCUX endif # PINMUX_MCUX
config UART_MCUX_0
default y if UART_CONSOLE
depends on UART_MCUX
endif # BOARD_TWR_KV58F220M endif # BOARD_TWR_KV58F220M

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

@ -24,14 +24,10 @@ config MCG_VDIV0
config MCG_FCRDIV config MCG_FCRDIV
default 2 default 2
config UART_MCUX_0
default y
depends on UART_MCUX
if PINMUX_MCUX if PINMUX_MCUX
config PINMUX_MCUX_PORTA config PINMUX_MCUX_PORTA
default y if UART_MCUX_0 default y if "$(dt_nodelabel_enabled,uart0)"
config PINMUX_MCUX_PORTB config PINMUX_MCUX_PORTB
default y if SPI_1 default y if SPI_1

6
boards/shields/sparkfun_sara_r4/boards/frdm_k64f.defconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2019 Linaro Limited
# SPDX-License-Identifier: Apache-2.0
config UART_MCUX_3
default y
depends on BOARD_FRDM_K64F

6
boards/shields/wnc_m14a2a/boards/frdm_k64f.defconfig
View file

@ -1,6 +0,0 @@
# Copyright (c) 2019 Linaro Limited
# SPDX-License-Identifier: Apache-2.0
config UART_MCUX_2
default y
depends on BOARD_FRDM_K64F

36
drivers/serial/Kconfig.mcux
View file

@ -3,44 +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 config UART_MCUX
bool "MCUX uart driver" bool "MCUX uart driver"
depends on HAS_MCUX && CLOCK_CONTROL depends on HAS_MCUX && CLOCK_CONTROL
select SERIAL_HAS_DRIVER select SERIAL_HAS_DRIVER
select SERIAL_SUPPORT_INTERRUPT select SERIAL_SUPPORT_INTERRUPT
help help
Enable the MCUX uart driver. Enable the MCUX uart driver.
if UART_MCUX
config UART_MCUX_0
bool "UART 0"
help
Enable UART 0.
config UART_MCUX_1
bool "UART 1"
help
Enable UART 1.
config UART_MCUX_2
bool "UART 2"
help
Enable UART 2.
config UART_MCUX_3
bool "UART 3"
help
Enable UART 3.
config UART_MCUX_4
bool "UART 4"
help
Enable UART 4.
config UART_MCUX_5
bool "UART 5"
help
Enable UART 5.
endif # UART_MCUX

309
drivers/serial/uart_mcux.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_uart
#include <errno.h> #include <errno.h>
#include <device.h> #include <device.h>
#include <drivers/uart.h> #include <drivers/uart.h>
@ -283,266 +285,59 @@ static const struct uart_driver_api uart_mcux_driver_api = {
#endif #endif
}; };
#ifdef CONFIG_UART_MCUX_0 #define UART_MCUX_DECLARE_CFG(n, IRQ_FUNC_INIT) \
static const struct uart_mcux_config uart_mcux_##n##_config = { \
#ifdef CONFIG_UART_INTERRUPT_DRIVEN .base = (UART_Type *)DT_INST_REG_ADDR(n), \
static void uart_mcux_config_func_0(struct device *dev); .clock_name = DT_INST_CLOCKS_LABEL(n), \
#endif .clock_subsys = (clock_control_subsys_t)DT_INST_CLOCKS_CELL(n, name),\
.baud_rate = DT_INST_PROP(n, current_speed), \
static const struct uart_mcux_config uart_mcux_0_config = { .hw_flow_control = DT_INST_PROP(n, hw_flow_control), \
.base = UART0, IRQ_FUNC_INIT \
.clock_name = DT_NXP_KINETIS_UART_UART_0_CLOCK_CONTROLLER,
.clock_subsys = (clock_control_subsys_t)DT_NXP_KINETIS_UART_UART_0_CLOCK_NAME,
.baud_rate = DT_NXP_KINETIS_UART_UART_0_CURRENT_SPEED,
.hw_flow_control = DT_NXP_KINETIS_UART_UART_0_HW_FLOW_CONTROL,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = uart_mcux_config_func_0,
#endif
};
static struct uart_mcux_data uart_mcux_0_data;
DEVICE_AND_API_INIT(uart_0, DT_NXP_KINETIS_UART_UART_0_LABEL,
&uart_mcux_init,
&uart_mcux_0_data, &uart_mcux_0_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&uart_mcux_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_0(struct device *dev)
{
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_0_IRQ_STATUS,
DT_NXP_KINETIS_UART_UART_0_IRQ_STATUS_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_0), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_0_IRQ_STATUS);
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_0_IRQ_ERROR,
DT_NXP_KINETIS_UART_UART_0_IRQ_ERROR_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_0), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_0_IRQ_ERROR);
} }
#endif
#endif /* CONFIG_UART_MCUX_0 */
#ifdef CONFIG_UART_MCUX_1
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_1(struct device *dev); #define UART_MCUX_CONFIG_FUNC(n) \
static void uart_mcux_config_func_##n(struct device *dev) \
{ \
IRQ_CONNECT(DT_INST_IRQ_BY_NAME(n, status, irq), \
DT_INST_IRQ_BY_NAME(n, status, priority), \
uart_mcux_isr, DEVICE_GET(uart_##n), 0); \
\
irq_enable(DT_INST_IRQ_BY_NAME(n, status, irq)); \
\
IRQ_CONNECT(DT_INST_IRQ_BY_NAME(n, error, irq), \
DT_INST_IRQ_BY_NAME(n, error, priority), \
uart_mcux_isr, DEVICE_GET(uart_##n), 0); \
\
irq_enable(DT_INST_IRQ_BY_NAME(n, error, irq)); \
}
#define UART_MCUX_IRQ_CFG_FUNC_INIT(n) \
.irq_config_func = uart_mcux_config_func_##n
#define UART_MCUX_INIT_CFG(n) \
UART_MCUX_DECLARE_CFG(n, UART_MCUX_IRQ_CFG_FUNC_INIT(n))
#else
#define UART_MCUX_CONFIG_FUNC(n)
#define UART_MCUX_IRQ_CFG_FUNC_INIT
#define UART_MCUX_INIT_CFG(n) \
UART_MCUX_DECLARE_CFG(n, UART_MCUX_IRQ_CFG_FUNC_INIT)
#endif #endif
static const struct uart_mcux_config uart_mcux_1_config = { #define UART_MCUX_INIT(n) \
.base = UART1, \
.clock_name = DT_NXP_KINETIS_UART_UART_1_CLOCK_CONTROLLER, static struct uart_mcux_data uart_mcux_##n##_data; \
.clock_subsys = (clock_control_subsys_t)DT_NXP_KINETIS_UART_UART_1_CLOCK_NAME, \
.baud_rate = DT_NXP_KINETIS_UART_UART_1_CURRENT_SPEED, static const struct uart_mcux_config uart_mcux_##n##_config; \
.hw_flow_control = DT_NXP_KINETIS_UART_UART_1_HW_FLOW_CONTROL, \
#ifdef CONFIG_UART_INTERRUPT_DRIVEN DEVICE_AND_API_INIT(uart_##n, DT_INST_LABEL(n), \
.irq_config_func = uart_mcux_config_func_1, &uart_mcux_init, \
#endif &uart_mcux_##n##_data, \
}; &uart_mcux_##n##_config, \
PRE_KERNEL_1, \
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \
&uart_mcux_driver_api); \
\
UART_MCUX_CONFIG_FUNC(n) \
\
UART_MCUX_INIT_CFG(n)
static struct uart_mcux_data uart_mcux_1_data; DT_INST_FOREACH(UART_MCUX_INIT)
DEVICE_AND_API_INIT(uart_1, DT_NXP_KINETIS_UART_UART_1_LABEL,
&uart_mcux_init,
&uart_mcux_1_data, &uart_mcux_1_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&uart_mcux_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_1(struct device *dev)
{
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_1_IRQ_STATUS,
DT_NXP_KINETIS_UART_UART_1_IRQ_STATUS_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_1), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_1_IRQ_STATUS);
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_1_IRQ_ERROR,
DT_NXP_KINETIS_UART_UART_1_IRQ_ERROR_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_1), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_1_IRQ_ERROR);
}
#endif
#endif /* CONFIG_UART_MCUX_1 */
#ifdef CONFIG_UART_MCUX_2
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_2(struct device *dev);
#endif
static const struct uart_mcux_config uart_mcux_2_config = {
.base = UART2,
.clock_name = DT_NXP_KINETIS_UART_UART_2_CLOCK_CONTROLLER,
.clock_subsys = (clock_control_subsys_t)DT_NXP_KINETIS_UART_UART_2_CLOCK_NAME,
.baud_rate = DT_NXP_KINETIS_UART_UART_2_CURRENT_SPEED,
.hw_flow_control = DT_NXP_KINETIS_UART_UART_2_HW_FLOW_CONTROL,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = uart_mcux_config_func_2,
#endif
};
static struct uart_mcux_data uart_mcux_2_data;
DEVICE_AND_API_INIT(uart_2, DT_NXP_KINETIS_UART_UART_2_LABEL,
&uart_mcux_init,
&uart_mcux_2_data, &uart_mcux_2_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&uart_mcux_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_2(struct device *dev)
{
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_2_IRQ_STATUS,
DT_NXP_KINETIS_UART_UART_2_IRQ_STATUS_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_2), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_2_IRQ_STATUS);
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_2_IRQ_ERROR,
DT_NXP_KINETIS_UART_UART_2_IRQ_ERROR_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_2), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_2_IRQ_ERROR);
}
#endif
#endif /* CONFIG_UART_MCUX_2 */
#ifdef CONFIG_UART_MCUX_3
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_3(struct device *dev);
#endif
static const struct uart_mcux_config uart_mcux_3_config = {
.base = UART3,
.clock_name = DT_NXP_KINETIS_UART_UART_3_CLOCK_CONTROLLER,
.clock_subsys = (clock_control_subsys_t)DT_NXP_KINETIS_UART_UART_3_CLOCK_NAME,
.baud_rate = DT_NXP_KINETIS_UART_UART_3_CURRENT_SPEED,
.hw_flow_control = DT_NXP_KINETIS_UART_UART_3_HW_FLOW_CONTROL,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = uart_mcux_config_func_3,
#endif
};
static struct uart_mcux_data uart_mcux_3_data;
DEVICE_AND_API_INIT(uart_3, DT_NXP_KINETIS_UART_UART_3_LABEL,
&uart_mcux_init,
&uart_mcux_3_data, &uart_mcux_3_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&uart_mcux_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_3(struct device *dev)
{
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_3_IRQ_STATUS,
DT_NXP_KINETIS_UART_UART_3_IRQ_STATUS_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_3), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_3_IRQ_STATUS);
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_3_IRQ_ERROR,
DT_NXP_KINETIS_UART_UART_3_IRQ_ERROR_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_3), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_3_IRQ_ERROR);
}
#endif
#endif /* CONFIG_UART_MCUX_3 */
#ifdef CONFIG_UART_MCUX_4
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_4(struct device *dev);
#endif
static const struct uart_mcux_config uart_mcux_4_config = {
.base = UART4,
.clock_name = DT_NXP_KINETIS_UART_UART_4_CLOCK_CONTROLLER,
.clock_subsys = (clock_control_subsys_t)DT_NXP_KINETIS_UART_UART_4_CLOCK_NAME,
.baud_rate = DT_NXP_KINETIS_UART_UART_4_CURRENT_SPEED,
.hw_flow_control = DT_NXP_KINETIS_UART_UART_4_HW_FLOW_CONTROL,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = uart_mcux_config_func_4,
#endif
};
static struct uart_mcux_data uart_mcux_4_data;
DEVICE_AND_API_INIT(uart_4, DT_NXP_KINETIS_UART_UART_4_LABEL,
&uart_mcux_init,
&uart_mcux_4_data, &uart_mcux_4_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&uart_mcux_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_4(struct device *dev)
{
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_4_IRQ_STATUS,
DT_NXP_KINETIS_UART_UART_4_IRQ_STATUS_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_4), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_4_IRQ_STATUS);
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_4_IRQ_ERROR,
DT_NXP_KINETIS_UART_UART_4_IRQ_ERROR_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_4), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_4_IRQ_ERROR);
}
#endif
#endif /* CONFIG_UART_MCUX_4 */
#ifdef CONFIG_UART_MCUX_5
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_5(struct device *dev);
#endif
static const struct uart_mcux_config uart_mcux_5_config = {
.base = UART5,
.clock_name = DT_NXP_KINETIS_UART_UART_5_CLOCK_CONTROLLER,
.clock_subsys = (clock_control_subsys_t)DT_NXP_KINETIS_UART_UART_5_CLOCK_NAME,
.baud_rate = DT_NXP_KINETIS_UART_UART_5_CURRENT_SPEED,
.hw_flow_control = DT_NXP_KINETIS_UART_UART_5_HW_FLOW_CONTROL,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = uart_mcux_config_func_5,
#endif
};
static struct uart_mcux_data uart_mcux_5_data;
DEVICE_AND_API_INIT(uart_5, DT_NXP_KINETIS_UART_UART_5_LABEL,
&uart_mcux_init,
&uart_mcux_5_data, &uart_mcux_5_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&uart_mcux_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void uart_mcux_config_func_5(struct device *dev)
{
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_5_IRQ_STATUS,
DT_NXP_KINETIS_UART_UART_5_IRQ_STATUS_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_5), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_5_IRQ_STATUS);
IRQ_CONNECT(DT_NXP_KINETIS_UART_UART_5_IRQ_ERROR,
DT_NXP_KINETIS_UART_UART_5_IRQ_ERROR_PRIORITY,
uart_mcux_isr, DEVICE_GET(uart_5), 0);
irq_enable(DT_NXP_KINETIS_UART_UART_5_IRQ_ERROR);
}
#endif
#endif /* CONFIG_UART_MCUX_5 */

1
samples/net/openthread/ncp/overlay-tri-n4m-br.conf
View file

@ -5,7 +5,6 @@ CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_0"
CONFIG_SHELL_PROMPT_UART="ncp-uart:~$ " CONFIG_SHELL_PROMPT_UART="ncp-uart:~$ "
# Use UART_1 for NCP # Use UART_1 for NCP
CONFIG_UART_MCUX_1=y
CONFIG_OPENTHREAD_NCP_SPINEL_ON_UART_DEV_NAME="UART_1" CONFIG_OPENTHREAD_NCP_SPINEL_ON_UART_DEV_NAME="UART_1"
# Use USB-CDC-ACM for NCP # Use USB-CDC-ACM for NCP