diff --git a/soc/arm/st_stm32/stm32f0/dts_fixup.h b/soc/arm/st_stm32/stm32f0/dts_fixup.h index a7184446a36..650655184d6 100644 --- a/soc/arm/st_stm32/stm32f0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f0/dts_fixup.h @@ -86,9 +86,9 @@ #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS -#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F0_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32f0_flash_controller)) -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL diff --git a/soc/arm/st_stm32/stm32f1/dts_fixup.h b/soc/arm/st_stm32/stm32f1/dts_fixup.h index 2deff3282f0..fc5926b6461 100644 --- a/soc/arm/st_stm32/stm32f1/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f1/dts_fixup.h @@ -87,7 +87,7 @@ #define DT_I2C_2_CLOCK_BITS DT_ST_STM32_I2C_V1_40005800_CLOCK_BITS #define DT_I2C_2_CLOCK_BUS DT_ST_STM32_I2C_V1_40005800_CLOCK_BUS -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL @@ -106,6 +106,6 @@ #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS -#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F1_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32f1_flash_controller)) /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32f2/dts_fixup.h b/soc/arm/st_stm32/stm32f2/dts_fixup.h index 76fb6b52a2c..588324869ad 100644 --- a/soc/arm/st_stm32/stm32f2/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f2/dts_fixup.h @@ -85,7 +85,7 @@ #define DT_GPIO_STM32_GPIOI_CLOCK_BITS DT_ST_STM32_GPIO_40022000_CLOCK_BITS #define DT_GPIO_STM32_GPIOI_CLOCK_BUS DT_ST_STM32_GPIO_40022000_CLOCK_BUS -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012000_LABEL diff --git a/soc/arm/st_stm32/stm32f3/dts_fixup.h b/soc/arm/st_stm32/stm32f3/dts_fixup.h index 3211825815b..bea658b756a 100644 --- a/soc/arm/st_stm32/stm32f3/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f3/dts_fixup.h @@ -88,11 +88,11 @@ #define DT_I2C_3_CLOCK_BITS DT_ST_STM32_I2C_V2_40007800_CLOCK_BITS #define DT_I2C_3_CLOCK_BUS DT_ST_STM32_I2C_V2_40007800_CLOCK_BUS -#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F3_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32f3_flash_controller)) -#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL +#define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) #define DT_ADC_1_NAME DT_ST_STM32_ADC_50000000_LABEL diff --git a/soc/arm/st_stm32/stm32f4/dts_fixup.h b/soc/arm/st_stm32/stm32f4/dts_fixup.h index a17fe666e46..c4daeab170a 100644 --- a/soc/arm/st_stm32/stm32f4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f4/dts_fixup.h @@ -271,9 +271,9 @@ #define DT_I2S_6_DMA_FEATURES_RX \ DT_ST_STM32_I2S_40015400_RX_DMAS_FEATURES -#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL +#define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012000_LABEL @@ -307,6 +307,6 @@ #define DT_CAN_2_CLOCK_BUS DT_ST_STM32_CAN_40006800_CLOCK_BUS #define DT_CAN_2_CLOCK_BITS DT_ST_STM32_CAN_40006800_CLOCK_BITS -#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F4_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32f4_flash_controller)) /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32f7/dts_fixup.h b/soc/arm/st_stm32/stm32f7/dts_fixup.h index 8bab420dc73..a505f8d71b8 100644 --- a/soc/arm/st_stm32/stm32f7/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f7/dts_fixup.h @@ -145,9 +145,9 @@ #define DT_I2C_4_CLOCK_BITS DT_ST_STM32_I2C_V2_40006000_CLOCK_BITS #define DT_I2C_4_CLOCK_BUS DT_ST_STM32_I2C_V2_40006000_CLOCK_BUS -#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL +#define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) -#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32F7_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32f7_flash_controller)) #define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS #define DT_CAN_1_BUS_SPEED DT_ST_STM32_CAN_40006400_BUS_SPEED @@ -164,7 +164,7 @@ #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012000_LABEL diff --git a/soc/arm/st_stm32/stm32g0/dts_fixup.h b/soc/arm/st_stm32/stm32g0/dts_fixup.h index d60743ae72f..4323d753b27 100644 --- a/soc/arm/st_stm32/stm32g0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32g0/dts_fixup.h @@ -8,7 +8,7 @@ #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32G0_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32g0_flash_controller)) #define DT_PWM_STM32_3_DEV_NAME DT_ST_STM32_PWM_40000400_PWM_LABEL #define DT_PWM_STM32_3_PRESCALER DT_ST_STM32_PWM_40000400_PWM_ST_PRESCALER @@ -78,6 +78,6 @@ #define DT_I2C_2_CLOCK_BITS DT_ST_STM32_I2C_V2_40005800_CLOCK_BITS #define DT_I2C_2_CLOCK_BUS DT_ST_STM32_I2C_V2_40005800_CLOCK_BUS -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32g4/dts_fixup.h b/soc/arm/st_stm32/stm32g4/dts_fixup.h index 867aa2d6d5d..51d7a7df275 100644 --- a/soc/arm/st_stm32/stm32g4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32g4/dts_fixup.h @@ -71,7 +71,7 @@ #define DT_GPIO_STM32_GPIOG_CLOCK_BITS DT_ST_STM32_GPIO_48001800_CLOCK_BITS #define DT_GPIO_STM32_GPIOG_CLOCK_BUS DT_ST_STM32_GPIO_48001800_CLOCK_BUS -#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32G4_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32g4_flash_controller)) #define DT_I2C_1_BASE_ADDRESS DT_ST_STM32_I2C_V2_40005400_BASE_ADDRESS #define DT_I2C_1_EVENT_IRQ_PRI DT_ST_STM32_I2C_V2_40005400_IRQ_EVENT_PRIORITY @@ -103,8 +103,8 @@ #define DT_I2C_3_CLOCK_BITS DT_ST_STM32_I2C_V2_40007800_CLOCK_BITS #define DT_I2C_3_CLOCK_BUS DT_ST_STM32_I2C_V2_40007800_CLOCK_BUS -#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL +#define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32h7/dts_fixup.h b/soc/arm/st_stm32/stm32h7/dts_fixup.h index 001581188bd..55db79b286f 100644 --- a/soc/arm/st_stm32/stm32h7/dts_fixup.h +++ b/soc/arm/st_stm32/stm32h7/dts_fixup.h @@ -109,7 +109,7 @@ #define DT_GPIO_STM32_GPIOK_CLOCK_BITS DT_ST_STM32_GPIO_58022800_CLOCK_BITS #define DT_GPIO_STM32_GPIOK_CLOCK_BUS DT_ST_STM32_GPIO_58022800_CLOCK_BUS -#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL +#define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) #define DT_I2C_1_BASE_ADDRESS DT_ST_STM32_I2C_V2_40005400_BASE_ADDRESS #define DT_I2C_1_EVENT_IRQ_PRI DT_ST_STM32_I2C_V2_40005400_IRQ_EVENT_PRIORITY diff --git a/soc/arm/st_stm32/stm32l0/dts_fixup.h b/soc/arm/st_stm32/stm32l0/dts_fixup.h index 8204a7ec260..d7c78970733 100644 --- a/soc/arm/st_stm32/stm32l0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l0/dts_fixup.h @@ -84,7 +84,7 @@ #define DT_I2C_3_CLOCK_BITS DT_ST_STM32_I2C_V2_40007800_CLOCK_BITS #define DT_I2C_3_CLOCK_BUS DT_ST_STM32_I2C_V2_40007800_CLOCK_BUS -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL diff --git a/soc/arm/st_stm32/stm32l1/dts_fixup.h b/soc/arm/st_stm32/stm32l1/dts_fixup.h index 36c7ca4ae07..f00ee28caf8 100644 --- a/soc/arm/st_stm32/stm32l1/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l1/dts_fixup.h @@ -82,9 +82,9 @@ #define DT_I2C_2_CLOCK_BITS DT_ST_STM32_I2C_V1_40005800_CLOCK_BITS #define DT_I2C_2_CLOCK_BUS DT_ST_STM32_I2C_V1_40005800_CLOCK_BUS -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL -#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL +#define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32l4/dts_fixup.h b/soc/arm/st_stm32/stm32l4/dts_fixup.h index 6201c05e88a..90e7a2efaa0 100644 --- a/soc/arm/st_stm32/stm32l4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l4/dts_fixup.h @@ -125,9 +125,9 @@ #define DT_I2C_4_CLOCK_BITS DT_ST_STM32_I2C_V2_40008400_CLOCK_BITS #define DT_I2C_4_CLOCK_BUS DT_ST_STM32_I2C_V2_40008400_CLOCK_BUS -#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL +#define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) -#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32L4_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32l4_flash_controller)) #define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS #define DT_CAN_1_BUS_SPEED DT_ST_STM32_CAN_40006400_BUS_SPEED @@ -144,7 +144,7 @@ #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) #define DT_ADC_1_NAME DT_ST_STM32_ADC_50040000_LABEL diff --git a/soc/arm/st_stm32/stm32wb/dts_fixup.h b/soc/arm/st_stm32/stm32wb/dts_fixup.h index bc423c7e3f6..019644f524b 100644 --- a/soc/arm/st_stm32/stm32wb/dts_fixup.h +++ b/soc/arm/st_stm32/stm32wb/dts_fixup.h @@ -62,9 +62,9 @@ #define DT_GPIO_STM32_GPIOH_CLOCK_BITS DT_ST_STM32_GPIO_48001C00_CLOCK_BITS #define DT_GPIO_STM32_GPIOH_CLOCK_BUS DT_ST_STM32_GPIO_48001C00_CLOCK_BUS -#define DT_RTC_0_NAME DT_INST_0_ST_STM32_RTC_LABEL +#define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) -#define DT_FLASH_DEV_NAME DT_INST_0_ST_STM32WB_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32wb_flash_controller)) #define DT_I2C_1_BASE_ADDRESS DT_ST_STM32_I2C_V2_40005400_BASE_ADDRESS #define DT_I2C_1_EVENT_IRQ_PRI DT_ST_STM32_I2C_V2_40005400_IRQ_EVENT_PRIORITY @@ -88,7 +88,7 @@ #define DT_ADC_1_NAME DT_ST_STM32_ADC_50040000_LABEL -#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) #define DT_LPTIM_1_BASE_ADDRESS DT_ST_STM32_TIMERS_40007C00_BASE_ADDRESS #define DT_LPTIM_1_IRQ DT_ST_STM32_TIMERS_40007C00_IRQ_0