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

16
drivers/gpio/gpio_intel_apl.c
View file

@ -430,22 +430,22 @@ static const struct gpio_intel_apl_config gpio_intel_apl_cfg = {
.islands = {
{
/* North island */
.reg_base = CONFIG_APL_GPIO_BASE_ADDRESS_0,
.reg_base = DT_APL_GPIO_BASE_ADDRESS_0,
.num_pins = 78,
},
{
/* Northwest island */
.reg_base = CONFIG_APL_GPIO_BASE_ADDRESS_1,
.reg_base = DT_APL_GPIO_BASE_ADDRESS_1,
.num_pins = 77,
},
{
/* West island */
.reg_base = CONFIG_APL_GPIO_BASE_ADDRESS_2,
.reg_base = DT_APL_GPIO_BASE_ADDRESS_2,
.num_pins = 47,
},
{
/* Southwest island */
.reg_base = CONFIG_APL_GPIO_BASE_ADDRESS_3,
.reg_base = DT_APL_GPIO_BASE_ADDRESS_3,
.num_pins = 43,
},
},
@ -453,7 +453,7 @@ static const struct gpio_intel_apl_config gpio_intel_apl_cfg = {
static struct gpio_intel_apl_data gpio_intel_apl_data;
DEVICE_AND_API_INIT(gpio_intel_apl, CONFIG_APL_GPIO_LABEL,
DEVICE_AND_API_INIT(gpio_intel_apl, DT_APL_GPIO_LABEL,
gpio_intel_apl_init,
&gpio_intel_apl_data, &gpio_intel_apl_cfg,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -461,9 +461,9 @@ DEVICE_AND_API_INIT(gpio_intel_apl, CONFIG_APL_GPIO_LABEL,
static void gpio_intel_apl_irq_config(struct device *dev)
{
IRQ_CONNECT(CONFIG_APL_GPIO_IRQ, CONFIG_APL_GPIO_IRQ_PRIORITY,
IRQ_CONNECT(DT_APL_GPIO_IRQ, DT_APL_GPIO_IRQ_PRIORITY,
gpio_intel_apl_isr, DEVICE_GET(gpio_intel_apl),
CONFIG_APL_GPIO_IRQ_SENSE);
DT_APL_GPIO_IRQ_SENSE);
irq_enable(CONFIG_APL_GPIO_IRQ);
irq_enable(DT_APL_GPIO_IRQ);
}