michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: serial: Update DTS-derived labels with DT_ prefix

Browse source 
Update a couple of labels generated from DTS used directly (not through
dts_fixups) in some serial drivers, to the reflect recent changes made
to the extracting script.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2018-11-08 08:26:54 +01:00 • committed by Kumar Gala
commit 8dd11d9736
3 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/serial/uart_cc32xx.c
View file

@ -35,7 +35,7 @@ static void uart_cc32xx_isr(void *arg);
#endif #endif
static const struct uart_device_config uart_cc32xx_dev_cfg_0 = { static const struct uart_device_config uart_cc32xx_dev_cfg_0 = {
.base = (void *)TI_CC32XX_UART_4000C000_BASE_ADDRESS, .base = (void *)DT_TI_CC32XX_UART_4000C000_BASE_ADDRESS,
.sys_clk_freq = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, .sys_clk_freq = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC,
}; };
@ -61,7 +61,7 @@ static int uart_cc32xx_init(struct device *dev)
/* This also calls MAP_UARTEnable() to enable the FIFOs: */ /* This also calls MAP_UARTEnable() to enable the FIFOs: */
MAP_UARTConfigSetExpClk((unsigned long)config->base, MAP_UARTConfigSetExpClk((unsigned long)config->base,
MAP_PRCMPeripheralClockGet(PRCM_UARTA0), MAP_PRCMPeripheralClockGet(PRCM_UARTA0),
TI_CC32XX_UART_4000C000_CURRENT_SPEED, DT_TI_CC32XX_UART_4000C000_CURRENT_SPEED,
(UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE (UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE
| UART_CONFIG_PAR_NONE)); | UART_CONFIG_PAR_NONE));
MAP_UARTFlowControlSet((unsigned long)config->base, MAP_UARTFlowControlSet((unsigned long)config->base,
@ -74,11 +74,11 @@ static int uart_cc32xx_init(struct device *dev)
MAP_UARTIntClear((unsigned long)config->base, MAP_UARTIntClear((unsigned long)config->base,
(UART_INT_RX | UART_INT_TX)); (UART_INT_RX | UART_INT_TX));
IRQ_CONNECT(TI_CC32XX_UART_4000C000_IRQ_0, IRQ_CONNECT(DT_TI_CC32XX_UART_4000C000_IRQ_0,
TI_CC32XX_UART_4000C000_IRQ_0_PRIORITY, DT_TI_CC32XX_UART_4000C000_IRQ_0_PRIORITY,
uart_cc32xx_isr, DEVICE_GET(uart_cc32xx_0), uart_cc32xx_isr, DEVICE_GET(uart_cc32xx_0),
0); 0);
irq_enable(TI_CC32XX_UART_4000C000_IRQ_0); irq_enable(DT_TI_CC32XX_UART_4000C000_IRQ_0);
#endif #endif
return 0; return 0;
} }

8
drivers/serial/uart_mcux_lpsci.c
View file

@ -295,7 +295,7 @@ static const struct mcux_lpsci_config mcux_lpsci_0_config = {
.clock_name = CONFIG_UART_MCUX_LPSCI_0_CLOCK_NAME, .clock_name = CONFIG_UART_MCUX_LPSCI_0_CLOCK_NAME,
.clock_subsys = .clock_subsys =
(clock_control_subsys_t)CONFIG_UART_MCUX_LPSCI_0_CLOCK_SUBSYS, (clock_control_subsys_t)CONFIG_UART_MCUX_LPSCI_0_CLOCK_SUBSYS,
.baud_rate = NXP_KINETIS_LPSCI_4006A000_CURRENT_SPEED, .baud_rate = DT_NXP_KINETIS_LPSCI_4006A000_CURRENT_SPEED,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = mcux_lpsci_config_func_0, .irq_config_func = mcux_lpsci_config_func_0,
#endif #endif
@ -312,11 +312,11 @@ DEVICE_AND_API_INIT(uart_0, CONFIG_UART_MCUX_LPSCI_0_NAME,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpsci_config_func_0(struct device *dev) static void mcux_lpsci_config_func_0(struct device *dev)
{ {
IRQ_CONNECT(NXP_KINETIS_LPSCI_4006A000_IRQ_0, IRQ_CONNECT(DT_NXP_KINETIS_LPSCI_4006A000_IRQ_0,
NXP_KINETIS_LPSCI_4006A000_IRQ_0_PRIORITY, DT_NXP_KINETIS_LPSCI_4006A000_IRQ_0_PRIORITY,
mcux_lpsci_isr, DEVICE_GET(uart_0), 0); mcux_lpsci_isr, DEVICE_GET(uart_0), 0);
irq_enable(NXP_KINETIS_LPSCI_4006A000_IRQ_0); irq_enable(DT_NXP_KINETIS_LPSCI_4006A000_IRQ_0);
} }
#endif #endif

36
drivers/serial/uart_stellaris.c
View file

@ -635,7 +635,7 @@ static void irq_config_func_0(struct device *port);
#endif #endif
static const struct uart_device_config uart_stellaris_dev_cfg_0 = { static const struct uart_device_config uart_stellaris_dev_cfg_0 = {
.base = (u8_t *)TI_STELLARIS_UART_4000C000_BASE_ADDRESS, .base = (u8_t *)DT_TI_STELLARIS_UART_4000C000_BASE_ADDRESS,
.sys_clk_freq = UART_STELLARIS_CLK_FREQ, .sys_clk_freq = UART_STELLARIS_CLK_FREQ,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
@ -644,10 +644,10 @@ static const struct uart_device_config uart_stellaris_dev_cfg_0 = {
}; };
static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_0 = { static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_0 = {
.baud_rate = TI_STELLARIS_UART_4000C000_CURRENT_SPEED, .baud_rate = DT_TI_STELLARIS_UART_4000C000_CURRENT_SPEED,
}; };
DEVICE_AND_API_INIT(uart_stellaris0, TI_STELLARIS_UART_4000C000_LABEL, DEVICE_AND_API_INIT(uart_stellaris0, DT_TI_STELLARIS_UART_4000C000_LABEL,
&uart_stellaris_init, &uart_stellaris_init,
&uart_stellaris_dev_data_0, &uart_stellaris_dev_cfg_0, &uart_stellaris_dev_data_0, &uart_stellaris_dev_cfg_0,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -656,11 +656,11 @@ DEVICE_AND_API_INIT(uart_stellaris0, TI_STELLARIS_UART_4000C000_LABEL,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void irq_config_func_0(struct device *dev) static void irq_config_func_0(struct device *dev)
{ {
IRQ_CONNECT(TI_STELLARIS_UART_4000C000_IRQ_0, IRQ_CONNECT(DT_TI_STELLARIS_UART_4000C000_IRQ_0,
TI_STELLARIS_UART_4000C000_IRQ_0_PRIORITY, DT_TI_STELLARIS_UART_4000C000_IRQ_0_PRIORITY,
uart_stellaris_isr, DEVICE_GET(uart_stellaris0), uart_stellaris_isr, DEVICE_GET(uart_stellaris0),
0); 0);
irq_enable(TI_STELLARIS_UART_4000C000_IRQ_0); irq_enable(DT_TI_STELLARIS_UART_4000C000_IRQ_0);
} }
#endif #endif
@ -673,7 +673,7 @@ static void irq_config_func_1(struct device *port);
#endif #endif
static struct uart_device_config uart_stellaris_dev_cfg_1 = { static struct uart_device_config uart_stellaris_dev_cfg_1 = {
.base = (u8_t *)TI_STELLARIS_UART_4000D000_BASE_ADDRESS, .base = (u8_t *)DT_TI_STELLARIS_UART_4000D000_BASE_ADDRESS,
.sys_clk_freq = UART_STELLARIS_CLK_FREQ, .sys_clk_freq = UART_STELLARIS_CLK_FREQ,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
@ -682,10 +682,10 @@ static struct uart_device_config uart_stellaris_dev_cfg_1 = {
}; };
static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_1 = { static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_1 = {
.baud_rate = TI_STELLARIS_UART_4000D000_CURRENT_SPEED, .baud_rate = DT_TI_STELLARIS_UART_4000D000_CURRENT_SPEED,
}; };
DEVICE_AND_API_INIT(uart_stellaris1, TI_STELLARIS_UART_4000D000_LABEL, DEVICE_AND_API_INIT(uart_stellaris1, DT_TI_STELLARIS_UART_4000D000_LABEL,
&uart_stellaris_init, &uart_stellaris_init,
&uart_stellaris_dev_data_1, &uart_stellaris_dev_cfg_1, &uart_stellaris_dev_data_1, &uart_stellaris_dev_cfg_1,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -694,11 +694,11 @@ DEVICE_AND_API_INIT(uart_stellaris1, TI_STELLARIS_UART_4000D000_LABEL,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void irq_config_func_1(struct device *dev) static void irq_config_func_1(struct device *dev)
{ {
IRQ_CONNECT(TI_STELLARIS_UART_4000D000_IRQ_0, IRQ_CONNECT(DT_TI_STELLARIS_UART_4000D000_IRQ_0,
TI_STELLARIS_UART_4000D000_IRQ_0_PRIORITY, DT_TI_STELLARIS_UART_4000D000_IRQ_0_PRIORITY,
uart_stellaris_isr, DEVICE_GET(uart_stellaris1), uart_stellaris_isr, DEVICE_GET(uart_stellaris1),
0); 0);
irq_enable(TI_STELLARIS_UART_4000D000_IRQ_0); irq_enable(DT_TI_STELLARIS_UART_4000D000_IRQ_0);
} }
#endif #endif
@ -711,7 +711,7 @@ static void irq_config_func_2(struct device *port);
#endif #endif
static const struct uart_device_config uart_stellaris_dev_cfg_2 = { static const struct uart_device_config uart_stellaris_dev_cfg_2 = {
.base = (u8_t *)TI_STELLARIS_UART_4000E000_BASE_ADDRESS, .base = (u8_t *)DT_TI_STELLARIS_UART_4000E000_BASE_ADDRESS,
.sys_clk_freq = UART_STELLARIS_CLK_FREQ, .sys_clk_freq = UART_STELLARIS_CLK_FREQ,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
@ -720,10 +720,10 @@ static const struct uart_device_config uart_stellaris_dev_cfg_2 = {
}; };
static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_2 = { static struct uart_stellaris_dev_data_t uart_stellaris_dev_data_2 = {
.baud_rate = TI_STELLARIS_UART_4000E000_CURRENT_SPEED, .baud_rate = DT_TI_STELLARIS_UART_4000E000_CURRENT_SPEED,
}; };
DEVICE_AND_API_INIT(uart_stellaris2, TI_STELLARIS_UART_4000E000_LABEL, DEVICE_AND_API_INIT(uart_stellaris2, DT_TI_STELLARIS_UART_4000E000_LABEL,
&uart_stellaris_init, &uart_stellaris_init,
&uart_stellaris_dev_data_2, &uart_stellaris_dev_cfg_2, &uart_stellaris_dev_data_2, &uart_stellaris_dev_cfg_2,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -732,11 +732,11 @@ DEVICE_AND_API_INIT(uart_stellaris2, TI_STELLARIS_UART_4000E000_LABEL,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void irq_config_func_2(struct device *dev) static void irq_config_func_2(struct device *dev)
{ {
IRQ_CONNECT(TI_STELLARIS_UART_4000E000_IRQ_0, IRQ_CONNECT(DT_TI_STELLARIS_UART_4000E000_IRQ_0,
TI_STELLARIS_UART_4000E000_IRQ_0_PRIORITY, DT_TI_STELLARIS_UART_4000E000_IRQ_0_PRIORITY,
uart_stellaris_isr, DEVICE_GET(uart_stellaris2), uart_stellaris_isr, DEVICE_GET(uart_stellaris2),
0); 0);
irq_enable(TI_STELLARIS_UART_4000E000_IRQ_0); irq_enable(DT_TI_STELLARIS_UART_4000E000_IRQ_0);
} }
#endif #endif