michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts_fixups: Use DT_ prefix in all defined labels not related to Kconfig

Browse source 
These changes were obtained by running a script  created by
Ulf Magnusson <Ulf.Magnusson@nordicsemi.no> for the following
specification:

1. Read the contents of all dts_fixup.h files in Zephyr
2. Check the left-hand side of the #define macros (i.e. the X in
   #define X Y)
3. Check if that name is also the name of a Kconfig option
   3.a If it is, then do nothing
   3.b If it is not, then replace CONFIG_ with DT_ or add DT_ if it
       has neither of these two prefixes
4. Replace the use of the changed #define in the code itself
   (.c, .h, .ld)

Additionally, some tweaks had to be added to this script to catch some
of the macros used in the code in a parameterized form, e.g.:
- CONFIG_GPIO_STM32_GPIO##__SUFFIX##_BASE_ADDRESS
- CONFIG_UART_##idx##_TX_PIN
- I2C_SBCON_##_num##_BASE_ADDR
and to prevent adding DT_ prefix to the following symbols:
- FLASH_START
- FLASH_SIZE
- SRAM_START
- SRAM_SIZE
- _ROM_ADDR
- _ROM_SIZE
- _RAM_ADDR
- _RAM_SIZE
which are surprisingly also defined in some dts_fixup.h files.

Finally, some manual corrections had to be done as well:
- name##_IRQ -> DT_##name##_IRQ in uart_stm32.c

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2018-11-13 15:15:23 +01:00 • committed by Kumar Gala
commit 20202902f2
304 changed files with 5118 additions and 5118 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/serial/uart_mcux_lpuart.c
View file

@ -292,10 +292,10 @@ static void mcux_lpuart_config_func_0(struct device *dev);
static const struct mcux_lpuart_config mcux_lpuart_0_config = {
.base = LPUART0,
.clock_name = CONFIG_UART_MCUX_LPUART_0_CLOCK_NAME,
.clock_name = DT_UART_MCUX_LPUART_0_CLOCK_NAME,
.clock_subsys =
(clock_control_subsys_t)CONFIG_UART_MCUX_LPUART_0_CLOCK_SUBSYS,
.baud_rate = CONFIG_UART_MCUX_LPUART_0_BAUD_RATE,
(clock_control_subsys_t)DT_UART_MCUX_LPUART_0_CLOCK_SUBSYS,
.baud_rate = DT_UART_MCUX_LPUART_0_BAUD_RATE,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = mcux_lpuart_config_func_0,
#endif
@ -303,7 +303,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, CONFIG_UART_MCUX_LPUART_0_NAME,
DEVICE_AND_API_INIT(uart_0, DT_UART_MCUX_LPUART_0_NAME,
&mcux_lpuart_init,
&mcux_lpuart_0_data, &mcux_lpuart_0_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -312,11 +312,11 @@ DEVICE_AND_API_INIT(uart_0, CONFIG_UART_MCUX_LPUART_0_NAME,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpuart_config_func_0(struct device *dev)
{
IRQ_CONNECT(CONFIG_UART_MCUX_LPUART_0_IRQ,
CONFIG_UART_MCUX_LPUART_0_IRQ_PRI,
IRQ_CONNECT(DT_UART_MCUX_LPUART_0_IRQ,
DT_UART_MCUX_LPUART_0_IRQ_PRI,
mcux_lpuart_isr, DEVICE_GET(uart_0), 0);
irq_enable(CONFIG_UART_MCUX_LPUART_0_IRQ);
irq_enable(DT_UART_MCUX_LPUART_0_IRQ);
}
#endif
@ -329,11 +329,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 *) CONFIG_UART_MCUX_LPUART_1_BASE_ADDRESS,
.clock_name = CONFIG_UART_MCUX_LPUART_1_CLOCK_NAME,
.base = (LPUART_Type *) DT_UART_MCUX_LPUART_1_BASE_ADDRESS,
.clock_name = DT_UART_MCUX_LPUART_1_CLOCK_NAME,
.clock_subsys =
(clock_control_subsys_t)CONFIG_UART_MCUX_LPUART_1_CLOCK_SUBSYS,
.baud_rate = CONFIG_UART_MCUX_LPUART_1_BAUD_RATE,
(clock_control_subsys_t)DT_UART_MCUX_LPUART_1_CLOCK_SUBSYS,
.baud_rate = DT_UART_MCUX_LPUART_1_BAUD_RATE,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = mcux_lpuart_config_func_1,
#endif
@ -341,7 +341,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, CONFIG_UART_MCUX_LPUART_1_NAME,
DEVICE_AND_API_INIT(uart_1, DT_UART_MCUX_LPUART_1_NAME,
&mcux_lpuart_init,
&mcux_lpuart_1_data, &mcux_lpuart_1_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -350,11 +350,11 @@ DEVICE_AND_API_INIT(uart_1, CONFIG_UART_MCUX_LPUART_1_NAME,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpuart_config_func_1(struct device *dev)
{
IRQ_CONNECT(CONFIG_UART_MCUX_LPUART_1_IRQ,
CONFIG_UART_MCUX_LPUART_1_IRQ_PRI,
IRQ_CONNECT(DT_UART_MCUX_LPUART_1_IRQ,
DT_UART_MCUX_LPUART_1_IRQ_PRI,
mcux_lpuart_isr, DEVICE_GET(uart_1), 0);
irq_enable(CONFIG_UART_MCUX_LPUART_1_IRQ);
irq_enable(DT_UART_MCUX_LPUART_1_IRQ);
}
#endif
@ -405,11 +405,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 *) CONFIG_UART_MCUX_LPUART_3_BASE_ADDRESS,
.clock_name = CONFIG_UART_MCUX_LPUART_3_CLOCK_NAME,
.base = (LPUART_Type *) DT_UART_MCUX_LPUART_3_BASE_ADDRESS,
.clock_name = DT_UART_MCUX_LPUART_3_CLOCK_NAME,
.clock_subsys =
(clock_control_subsys_t)CONFIG_UART_MCUX_LPUART_3_CLOCK_SUBSYS,
.baud_rate = CONFIG_UART_MCUX_LPUART_3_BAUD_RATE,
(clock_control_subsys_t)DT_UART_MCUX_LPUART_3_CLOCK_SUBSYS,
.baud_rate = DT_UART_MCUX_LPUART_3_BAUD_RATE,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = mcux_lpuart_config_func_3,
#endif
@ -417,7 +417,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, CONFIG_UART_MCUX_LPUART_3_NAME,
DEVICE_AND_API_INIT(uart_3, DT_UART_MCUX_LPUART_3_NAME,
&mcux_lpuart_init,
&mcux_lpuart_3_data, &mcux_lpuart_3_config,
PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -426,11 +426,11 @@ DEVICE_AND_API_INIT(uart_3, CONFIG_UART_MCUX_LPUART_3_NAME,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void mcux_lpuart_config_func_3(struct device *dev)
{
IRQ_CONNECT(CONFIG_UART_MCUX_LPUART_3_IRQ,
CONFIG_UART_MCUX_LPUART_3_IRQ_PRI,
IRQ_CONNECT(DT_UART_MCUX_LPUART_3_IRQ,
DT_UART_MCUX_LPUART_3_IRQ_PRI,
mcux_lpuart_isr, DEVICE_GET(uart_3), 0);
irq_enable(CONFIG_UART_MCUX_LPUART_3_IRQ);
irq_enable(DT_UART_MCUX_LPUART_3_IRQ);
}
#endif