michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: Fix mcux lpuart instance 2

Browse source 
The mcux lpuart shim driver was updated in commit
20202902f2 to use DT_ prefix in all
defined labels not related to Kconfig, but instance 2 was missed.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2019-01-14 15:04:26 -06:00
commit c80b564ec2
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/serial/uart_mcux_lpuart.c
View file

@ -365,11 +365,11 @@ static void mcux_lpuart_config_func_2(struct device *dev);
#endif #endif
static const struct mcux_lpuart_config mcux_lpuart_2_config = { static const struct mcux_lpuart_config mcux_lpuart_2_config = {
.base = (LPUART_Type *) CONFIG_UART_MCUX_LPUART_2_BASE_ADDRESS, .base = (LPUART_Type *) DT_UART_MCUX_LPUART_2_BASE_ADDRESS,
.clock_name = CONFIG_UART_MCUX_LPUART_2_CLOCK_NAME, .clock_name = DT_UART_MCUX_LPUART_2_CLOCK_NAME,
.clock_subsys = .clock_subsys =
(clock_control_subsys_t)CONFIG_UART_MCUX_LPUART_2_CLOCK_SUBSYS, (clock_control_subsys_t)DT_UART_MCUX_LPUART_2_CLOCK_SUBSYS,
.baud_rate = CONFIG_UART_MCUX_LPUART_2_BAUD_RATE, .baud_rate = DT_UART_MCUX_LPUART_2_BAUD_RATE,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = mcux_lpuart_config_func_2, .irq_config_func = mcux_lpuart_config_func_2,
#endif #endif
@ -377,7 +377,7 @@ static const struct mcux_lpuart_config mcux_lpuart_2_config = {
static struct mcux_lpuart_data mcux_lpuart_2_data; static struct mcux_lpuart_data mcux_lpuart_2_data;
DEVICE_AND_API_INIT(uart_2, CONFIG_UART_MCUX_LPUART_2_NAME, DEVICE_AND_API_INIT(uart_2, DT_UART_MCUX_LPUART_2_NAME,
&mcux_lpuart_init, &mcux_lpuart_init,
&mcux_lpuart_2_data, &mcux_lpuart_2_config, &mcux_lpuart_2_data, &mcux_lpuart_2_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -386,11 +386,11 @@ DEVICE_AND_API_INIT(uart_2, CONFIG_UART_MCUX_LPUART_2_NAME,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpuart_config_func_2(struct device *dev) static void mcux_lpuart_config_func_2(struct device *dev)
{ {
IRQ_CONNECT(CONFIG_UART_MCUX_LPUART_2_IRQ, IRQ_CONNECT(DT_UART_MCUX_LPUART_2_IRQ,
CONFIG_UART_MCUX_LPUART_2_IRQ_PRI, DT_UART_MCUX_LPUART_2_IRQ_PRI,
mcux_lpuart_isr, DEVICE_GET(uart_2), 0); mcux_lpuart_isr, DEVICE_GET(uart_2), 0);
irq_enable(CONFIG_UART_MCUX_LPUART_2_IRQ); irq_enable(DT_UART_MCUX_LPUART_2_IRQ);
} }
#endif #endif