diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c index f24283cafdc..89cb636f108 100644 --- a/drivers/serial/uart_stm32.c +++ b/drivers/serial/uart_stm32.c @@ -363,10 +363,6 @@ static int uart_stm32_init(struct device *dev) return 0; } -/* Define clocks */ -#define STM32_CLOCK_UART(clock_bus, clock_enr) \ - .pclken = { .bus = clock_bus, \ - .enr = clock_enr } #ifdef CONFIG_UART_INTERRUPT_DRIVEN #define STM32_UART_IRQ_HANDLER_DECL(name) \ @@ -388,7 +384,7 @@ static void uart_stm32_irq_config_func_##name(struct device *dev) \ #define STM32_UART_IRQ_HANDLER(name) #endif -#define STM32_UART_INIT(name, clock_bus, clock_enr) \ +#define STM32_UART_INIT(name) \ STM32_UART_IRQ_HANDLER_DECL(name); \ \ static const struct uart_stm32_config uart_stm32_cfg_##name = { \ @@ -396,7 +392,9 @@ static const struct uart_stm32_config uart_stm32_cfg_##name = { \ .base = (u8_t *)CONFIG_UART_STM32_##name##_BASE_ADDRESS,\ STM32_UART_IRQ_HANDLER_FUNC(name) \ }, \ - STM32_CLOCK_UART(clock_bus, clock_enr), \ + .pclken = { .bus = CONFIG_UART_STM32_##name##_CLOCK_BUS, \ + .enr = CONFIG_UART_STM32_##name##_CLOCK_BITS \ + }, \ .baud_rate = CONFIG_UART_STM32_##name##_BAUD_RATE \ }; \ \ @@ -419,104 +417,104 @@ STM32_UART_IRQ_HANDLER(name) #if defined(CONFIG_SOC_SERIES_STM32F0X) #ifdef CONFIG_UART_STM32_PORT_1 -STM32_UART_INIT(USART_1, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART1) +STM32_UART_INIT(USART_1) #endif /* CONFIG_UART_STM32_PORT_1 */ #ifdef CONFIG_UART_STM32_PORT_2 -STM32_UART_INIT(USART_2, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART2) +STM32_UART_INIT(USART_2) #endif /* CONFIG_UART_STM32_PORT_2 */ #ifdef CONFIG_UART_STM32_PORT_3 -STM32_UART_INIT(USART_3, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART3) +STM32_UART_INIT(USART_3) #endif /* CONFIG_UART_STM32_PORT_3 */ #ifdef CONFIG_UART_STM32_PORT_4 -STM32_UART_INIT(USART_4, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART4) +STM32_UART_INIT(USART_4) #endif /* CONFIG_UART_STM32_PORT_4 */ #ifdef CONFIG_UART_STM32_PORT_5 -STM32_UART_INIT(USART_5, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART5) +STM32_UART_INIT(USART_5) #endif /* CONFIG_UART_STM32_PORT_5 */ #ifdef CONFIG_UART_STM32_PORT_6 -STM32_UART_INIT(USART_6, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART6) +STM32_UART_INIT(USART_6) #endif /* CONFIG_UART_STM32_PORT_6 */ #ifdef CONFIG_UART_STM32_PORT_7 -STM32_UART_INIT(USART_7, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART7) +STM32_UART_INIT(USART_7) #endif /* CONFIG_UART_STM32_PORT_7 */ #ifdef CONFIG_UART_STM32_PORT_8 -STM32_UART_INIT(USART_8, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART8) +STM32_UART_INIT(USART_8) #endif /* CONFIG_UART_STM32_PORT_8 */ #elif defined(CONFIG_SOC_SERIES_STM32L0X) #ifdef CONFIG_UART_STM32_PORT_1 -STM32_UART_INIT(USART_1, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_USART1) +STM32_UART_INIT(USART_1) #endif /* CONFIG_UART_STM32_PORT_1 */ #ifdef CONFIG_UART_STM32_PORT_2 -STM32_UART_INIT(USART_2, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART2) +STM32_UART_INIT(USART_2) #endif /* CONFIG_UART_STM32_PORT_2 */ #ifdef CONFIG_UART_STM32_PORT_4 -STM32_UART_INIT(USART_4, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART4) +STM32_UART_INIT(USART_4) #endif /* CONFIG_UART_STM32_PORT_4 */ #ifdef CONFIG_UART_STM32_PORT_5 -STM32_UART_INIT(USART_5, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART5) +STM32_UART_INIT(USART_5) #endif /* CONFIG_UART_STM32_PORT_5 */ #ifdef CONFIG_UART_STM32_LPUART_1 -STM32_UART_INIT(LPUART_1, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_LPUART1) +STM32_UART_INIT(LPUART_1) #endif /* CONFIG_UART_STM32_LPUART_1 */ #else #ifdef CONFIG_UART_STM32_PORT_1 -STM32_UART_INIT(USART_1, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_USART1) +STM32_UART_INIT(USART_1) #endif /* CONFIG_UART_STM32_PORT_1 */ #ifdef CONFIG_UART_STM32_PORT_2 -STM32_UART_INIT(USART_2, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART2) +STM32_UART_INIT(USART_2) #endif /* CONFIG_UART_STM32_PORT_2 */ #ifdef CONFIG_UART_STM32_PORT_3 -STM32_UART_INIT(USART_3, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART3) +STM32_UART_INIT(USART_3) #endif /* CONFIG_UART_STM32_PORT_3 */ #ifdef CONFIG_UART_STM32_PORT_4 -STM32_UART_INIT(UART_4, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART4) +STM32_UART_INIT(UART_4) #endif /* CONFIG_UART_STM32_PORT_4 */ #ifdef CONFIG_UART_STM32_PORT_5 -STM32_UART_INIT(UART_5, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART5) +STM32_UART_INIT(UART_5) #endif /* CONFIG_UART_STM32_PORT_5 */ #ifdef CONFIG_UART_STM32_PORT_6 -STM32_UART_INIT(USART_6, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_USART6) +STM32_UART_INIT(USART_6) #endif /* CONFIG_UART_STM32_PORT_6 */ #ifdef CONFIG_UART_STM32_PORT_7 -STM32_UART_INIT(UART_7, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART7) +STM32_UART_INIT(UART_7) #endif /* CONFIG_UART_STM32_PORT_7 */ #ifdef CONFIG_UART_STM32_PORT_8 -STM32_UART_INIT(UART_8, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART8) +STM32_UART_INIT(UART_8) #endif /* CONFIG_UART_STM32_PORT_8 */ #ifdef CONFIG_UART_STM32_PORT_9 -STM32_UART_INIT(UART_9, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_UART9) +STM32_UART_INIT(UART_9) #endif /* CONFIG_UART_STM32_PORT_9 */ #ifdef CONFIG_UART_STM32_PORT_10 -STM32_UART_INIT(UART_10, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_UART10) +STM32_UART_INIT(UART_10) #endif /* CONFIG_UART_STM32_PORT_10 */ #ifdef CONFIG_SOC_SERIES_STM32L4X #ifdef CONFIG_UART_STM32_LPUART_1 -STM32_UART_INIT(LPUART_1, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_LPUART1) +STM32_UART_INIT(LPUART_1) #endif /* CONFIG_UART_STM32_LPUART_1 */ #endif /* CONFIG_SOC_SERIES_STM32L4X */ diff --git a/soc/arm/st_stm32/stm32f0/dts_fixup.h b/soc/arm/st_stm32/stm32f0/dts_fixup.h index 5611694f774..1fc8583bf97 100644 --- a/soc/arm/st_stm32/stm32f0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f0/dts_fixup.h @@ -61,12 +61,16 @@ #define CONFIG_UART_STM32_USART_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_1_NAME ST_STM32_USART_40013800_LABEL #define USART_1_IRQ ST_STM32_USART_40013800_IRQ_0 +#define CONFIG_UART_STM32_USART_1_CLOCK_BITS ST_STM32_USART_40013800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_1_CLOCK_BUS ST_STM32_USART_40013800_CLOCK_BUS #define CONFIG_UART_STM32_USART_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_2_NAME ST_STM32_USART_40004400_LABEL #define USART_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#define CONFIG_UART_STM32_USART_2_CLOCK_BITS ST_STM32_USART_40004400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_2_CLOCK_BUS ST_STM32_USART_40004400_CLOCK_BUS #define CONFIG_I2C_1_BASE_ADDRESS ST_STM32_I2C_V2_40005400_BASE_ADDRESS #define CONFIG_I2C_1_COMBINED_IRQ_PRI ST_STM32_I2C_V2_40005400_IRQ_COMBINED_PRIORITY diff --git a/soc/arm/st_stm32/stm32f1/dts_fixup.h b/soc/arm/st_stm32/stm32f1/dts_fixup.h index b121c4a3abf..f3e6e653175 100644 --- a/soc/arm/st_stm32/stm32f1/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f1/dts_fixup.h @@ -61,24 +61,32 @@ #define CONFIG_UART_STM32_USART_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_1_NAME ST_STM32_USART_40013800_LABEL #define USART_1_IRQ ST_STM32_USART_40013800_IRQ_0 +#define CONFIG_UART_STM32_USART_1_CLOCK_BITS ST_STM32_USART_40013800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_1_CLOCK_BUS ST_STM32_USART_40013800_CLOCK_BUS #define CONFIG_UART_STM32_USART_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_2_NAME ST_STM32_USART_40004400_LABEL #define USART_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#define CONFIG_UART_STM32_USART_2_CLOCK_BITS ST_STM32_USART_40004400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_2_CLOCK_BUS ST_STM32_USART_40004400_CLOCK_BUS #define CONFIG_UART_STM32_USART_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_USART_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_USART_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_3_NAME ST_STM32_USART_40004800_LABEL #define USART_3_IRQ ST_STM32_USART_40004800_IRQ_0 +#define CONFIG_UART_STM32_USART_3_CLOCK_BITS ST_STM32_USART_40004800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_3_CLOCK_BUS ST_STM32_USART_40004800_CLOCK_BUS #define CONFIG_UART_STM32_UART_4_BASE_ADDRESS ST_STM32_UART_40004C00_BASE_ADDRESS #define CONFIG_UART_STM32_UART_4_BAUD_RATE ST_STM32_UART_40004C00_CURRENT_SPEED #define CONFIG_UART_STM32_UART_4_IRQ_PRI ST_STM32_UART_40004C00_IRQ_0_PRIORITY #define CONFIG_UART_STM32_UART_4_NAME ST_STM32_UART_40004C00_LABEL #define UART_4_IRQ ST_STM32_UART_40004C00_IRQ_0 +#define CONFIG_UART_STM32_UART_4_CLOCK_BITS ST_STM32_UART_40004C00_CLOCK_BITS +#define CONFIG_UART_STM32_UART_4_CLOCK_BUS ST_STM32_UART_40004C00_CLOCK_BUS #define CONFIG_I2C_1_BASE_ADDRESS ST_STM32_I2C_V1_40005400_BASE_ADDRESS #define CONFIG_I2C_1_EVENT_IRQ_PRI ST_STM32_I2C_V1_40005400_IRQ_EVENT_PRIORITY diff --git a/soc/arm/st_stm32/stm32f2/dts_fixup.h b/soc/arm/st_stm32/stm32f2/dts_fixup.h index edb4d8a19d4..58f46ff79a8 100644 --- a/soc/arm/st_stm32/stm32f2/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f2/dts_fixup.h @@ -88,36 +88,48 @@ #define CONFIG_UART_STM32_USART_1_IRQ_PRI ST_STM32_USART_40011000_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_1_NAME ST_STM32_USART_40011000_LABEL #define USART_1_IRQ ST_STM32_USART_40011000_IRQ_0 +#define CONFIG_UART_STM32_USART_1_CLOCK_BITS ST_STM32_USART_40011000_CLOCK_BITS +#define CONFIG_UART_STM32_USART_1_CLOCK_BUS ST_STM32_USART_40011000_CLOCK_BUS #define CONFIG_UART_STM32_USART_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_2_NAME ST_STM32_USART_40004400_LABEL #define USART_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#define CONFIG_UART_STM32_USART_2_CLOCK_BITS ST_STM32_USART_40004400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_2_CLOCK_BUS ST_STM32_USART_40004400_CLOCK_BUS #define CONFIG_UART_STM32_USART_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_USART_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_USART_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_3_NAME ST_STM32_USART_40004800_LABEL #define USART_3_IRQ ST_STM32_USART_40004800_IRQ_0 +#define CONFIG_UART_STM32_USART_3_CLOCK_BITS ST_STM32_USART_40004800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_3_CLOCK_BUS ST_STM32_USART_40004800_CLOCK_BUS #define CONFIG_UART_STM32_USART_6_NAME ST_STM32_USART_40011400_LABEL #define CONFIG_UART_STM32_USART_6_BASE_ADDRESS ST_STM32_USART_40011400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_6_BAUD_RATE ST_STM32_USART_40011400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_6_IRQ_PRI ST_STM32_USART_40011400_IRQ_0_PRIORITY #define USART_6_IRQ ST_STM32_USART_40011400_IRQ_0 +#define CONFIG_UART_STM32_USART_6_CLOCK_BITS ST_STM32_USART_40011400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_6_CLOCK_BUS ST_STM32_USART_40011400_CLOCK_BUS #define CONFIG_UART_STM32_UART_4_NAME ST_STM32_UART_40004C00_LABEL #define CONFIG_UART_STM32_UART_4_BASE_ADDRESS ST_STM32_UART_40004C00_BASE_ADDRESS #define CONFIG_UART_STM32_UART_4_BAUD_RATE ST_STM32_UART_40004C00_CURRENT_SPEED #define CONFIG_UART_STM32_UART_4_IRQ_PRI ST_STM32_UART_40004C00_IRQ_0_PRIORITY #define UART_4_IRQ ST_STM32_UART_40004C00_IRQ_0 +#define CONFIG_UART_STM32_UART_4_CLOCK_BITS ST_STM32_UART_40004C00_CLOCK_BITS +#define CONFIG_UART_STM32_UART_4_CLOCK_BUS ST_STM32_UART_40004C00_CLOCK_BUS #define CONFIG_UART_STM32_UART_5_NAME ST_STM32_UART_40005000_LABEL #define CONFIG_UART_STM32_UART_5_BASE_ADDRESS ST_STM32_UART_40005000_BASE_ADDRESS #define CONFIG_UART_STM32_UART_5_BAUD_RATE ST_STM32_UART_40005000_CURRENT_SPEED #define CONFIG_UART_STM32_UART_5_IRQ_PRI ST_STM32_UART_40005000_IRQ_0_PRIORITY #define UART_5_IRQ ST_STM32_UART_40005000_IRQ_0 +#define CONFIG_UART_STM32_UART_5_CLOCK_BITS ST_STM32_UART_40005000_CLOCK_BITS +#define CONFIG_UART_STM32_UART_5_CLOCK_BUS ST_STM32_UART_40005000_CLOCK_BUS #define CONFIG_USB_BASE_ADDRESS ST_STM32_OTGFS_50000000_BASE_ADDRESS #define CONFIG_USB_IRQ ST_STM32_OTGFS_50000000_IRQ_OTGFS diff --git a/soc/arm/st_stm32/stm32f3/dts_fixup.h b/soc/arm/st_stm32/stm32f3/dts_fixup.h index 0fe3468d9fe..5d75f7bc388 100644 --- a/soc/arm/st_stm32/stm32f3/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f3/dts_fixup.h @@ -61,18 +61,24 @@ #define CONFIG_UART_STM32_USART_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_1_NAME ST_STM32_USART_40013800_LABEL #define USART_1_IRQ ST_STM32_USART_40013800_IRQ_0 +#define CONFIG_UART_STM32_USART_1_CLOCK_BITS ST_STM32_USART_40013800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_1_CLOCK_BUS ST_STM32_USART_40013800_CLOCK_BUS #define CONFIG_UART_STM32_USART_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_2_NAME ST_STM32_USART_40004400_LABEL #define USART_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#define CONFIG_UART_STM32_USART_2_CLOCK_BITS ST_STM32_USART_40004400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_2_CLOCK_BUS ST_STM32_USART_40004400_CLOCK_BUS #define CONFIG_UART_STM32_USART_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_USART_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_USART_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_3_NAME ST_STM32_USART_40004800_LABEL #define USART_3_IRQ ST_STM32_USART_40004800_IRQ_0 +#define CONFIG_UART_STM32_USART_3_CLOCK_BITS ST_STM32_USART_40004800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_3_CLOCK_BUS ST_STM32_USART_40004800_CLOCK_BUS #define CONFIG_I2C_1_BASE_ADDRESS ST_STM32_I2C_V2_40005400_BASE_ADDRESS #define CONFIG_I2C_1_EVENT_IRQ_PRI ST_STM32_I2C_V2_40005400_IRQ_EVENT_PRIORITY diff --git a/soc/arm/st_stm32/stm32f4/dts_fixup.h b/soc/arm/st_stm32/stm32f4/dts_fixup.h index 8dd1877f97e..5cd8db0750c 100644 --- a/soc/arm/st_stm32/stm32f4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f4/dts_fixup.h @@ -106,24 +106,32 @@ #define CONFIG_UART_STM32_USART_1_IRQ_PRI ST_STM32_USART_40011000_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_1_NAME ST_STM32_USART_40011000_LABEL #define USART_1_IRQ ST_STM32_USART_40011000_IRQ_0 +#define CONFIG_UART_STM32_USART_1_CLOCK_BITS ST_STM32_USART_40011000_CLOCK_BITS +#define CONFIG_UART_STM32_USART_1_CLOCK_BUS ST_STM32_USART_40011000_CLOCK_BUS #define CONFIG_UART_STM32_USART_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_2_NAME ST_STM32_USART_40004400_LABEL #define USART_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#define CONFIG_UART_STM32_USART_2_CLOCK_BITS ST_STM32_USART_40004400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_2_CLOCK_BUS ST_STM32_USART_40004400_CLOCK_BUS #define CONFIG_UART_STM32_USART_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_USART_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_USART_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_3_NAME ST_STM32_USART_40004800_LABEL #define USART_3_IRQ ST_STM32_USART_40004800_IRQ_0 +#define CONFIG_UART_STM32_USART_3_CLOCK_BITS ST_STM32_USART_40004800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_3_CLOCK_BUS ST_STM32_USART_40004800_CLOCK_BUS #define CONFIG_UART_STM32_USART_6_NAME ST_STM32_USART_40011400_LABEL #define CONFIG_UART_STM32_USART_6_BASE_ADDRESS ST_STM32_USART_40011400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_6_BAUD_RATE ST_STM32_USART_40011400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_6_IRQ_PRI ST_STM32_USART_40011400_IRQ_0_PRIORITY #define USART_6_IRQ ST_STM32_USART_40011400_IRQ_0 +#define CONFIG_UART_STM32_USART_6_CLOCK_BITS ST_STM32_USART_40011400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_6_CLOCK_BUS ST_STM32_USART_40011400_CLOCK_BUS #define CONFIG_I2C_1_BASE_ADDRESS ST_STM32_I2C_V1_40005400_BASE_ADDRESS #define CONFIG_I2C_1_EVENT_IRQ_PRI ST_STM32_I2C_V1_40005400_IRQ_EVENT_PRIORITY diff --git a/soc/arm/st_stm32/stm32f7/dts_fixup.h b/soc/arm/st_stm32/stm32f7/dts_fixup.h index 21c35670e7e..e8b85614418 100644 --- a/soc/arm/st_stm32/stm32f7/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f7/dts_fixup.h @@ -106,48 +106,64 @@ #define CONFIG_UART_STM32_USART_1_IRQ_PRI ST_STM32_USART_40011000_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_1_NAME ST_STM32_USART_40011000_LABEL #define USART_1_IRQ ST_STM32_USART_40011000_IRQ_0 +#define CONFIG_UART_STM32_USART_1_CLOCK_BITS ST_STM32_USART_40011000_CLOCK_BITS +#define CONFIG_UART_STM32_USART_1_CLOCK_BUS ST_STM32_USART_40011000_CLOCK_BUS #define CONFIG_UART_STM32_USART_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_2_NAME ST_STM32_USART_40004400_LABEL #define USART_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#define CONFIG_UART_STM32_USART_2_CLOCK_BITS ST_STM32_USART_40004400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_2_CLOCK_BUS ST_STM32_USART_40004400_CLOCK_BUS #define CONFIG_UART_STM32_USART_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_USART_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_USART_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_3_NAME ST_STM32_USART_40004800_LABEL #define USART_3_IRQ ST_STM32_USART_40004800_IRQ_0 +#define CONFIG_UART_STM32_USART_3_CLOCK_BITS ST_STM32_USART_40004800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_3_CLOCK_BUS ST_STM32_USART_40004800_CLOCK_BUS #define CONFIG_UART_STM32_USART_4_BASE_ADDRESS ST_STM32_USART_40004C00_BASE_ADDRESS #define CONFIG_UART_STM32_USART_4_BAUD_RATE ST_STM32_USART_40004C00_CURRENT_SPEED #define CONFIG_UART_STM32_USART_4_IRQ_PRI ST_STM32_USART_40004C00_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_4_NAME ST_STM32_USART_40004C00_LABEL #define USART_4_IRQ ST_STM32_USART_40004C00_IRQ_0 +#define CONFIG_UART_STM32_USART_4_CLOCK_BITS ST_STM32_USART_40004C00_CLOCK_BITS +#define CONFIG_UART_STM32_USART_4_CLOCK_BUS ST_STM32_USART_40004C00_CLOCK_BUS #define CONFIG_UART_STM32_USART_5_BASE_ADDRESS ST_STM32_USART_40005000_BASE_ADDRESS #define CONFIG_UART_STM32_USART_5_BAUD_RATE ST_STM32_USART_40005000_CURRENT_SPEED #define CONFIG_UART_STM32_USART_5_IRQ_PRI ST_STM32_USART_40005000_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_5_NAME ST_STM32_USART_40005000_LABEL #define USART_5_IRQ ST_STM32_USART_40005000_IRQ_0 +#define CONFIG_UART_STM32_USART_5_CLOCK_BITS ST_STM32_USART_40005000_CLOCK_BITS +#define CONFIG_UART_STM32_USART_5_CLOCK_BUS ST_STM32_USART_40005000_CLOCK_BUS #define CONFIG_UART_STM32_USART_6_BASE_ADDRESS ST_STM32_USART_40011400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_6_BAUD_RATE ST_STM32_USART_40011400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_6_IRQ_PRI ST_STM32_USART_40011400_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_6_NAME ST_STM32_USART_40011400_LABEL #define USART_6_IRQ ST_STM32_USART_40011400_IRQ_0 +#define CONFIG_UART_STM32_USART_6_CLOCK_BITS ST_STM32_USART_40011400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_6_CLOCK_BUS ST_STM32_USART_40011400_CLOCK_BUS #define CONFIG_UART_STM32_USART_7_BASE_ADDRESS ST_STM32_USART_40007800_BASE_ADDRESS #define CONFIG_UART_STM32_USART_7_BAUD_RATE ST_STM32_USART_40007800_CURRENT_SPEED #define CONFIG_UART_STM32_USART_7_IRQ_PRI ST_STM32_USART_40007800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_7_NAME ST_STM32_USART_40007800_LABEL #define USART_7_IRQ ST_STM32_USART_40007800_IRQ_0 +#define CONFIG_UART_STM32_USART_7_CLOCK_BITS ST_STM32_USART_40007800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_7_CLOCK_BUS ST_STM32_USART_40007800_CLOCK_BUS #define CONFIG_UART_STM32_USART_8_BASE_ADDRESS ST_STM32_USART_40007C00_BASE_ADDRESS #define CONFIG_UART_STM32_USART_8_BAUD_RATE ST_STM32_USART_40007C00_CURRENT_SPEED #define CONFIG_UART_STM32_USART_8_IRQ_PRI ST_STM32_USART_40007C00_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_8_NAME ST_STM32_USART_40007800_LABEL #define USART_8_IRQ ST_STM32_USART_40007C00_IRQ_0 +#define CONFIG_UART_STM32_USART_8_CLOCK_BITS ST_STM32_USART_40007C00_CLOCK_BITS +#define CONFIG_UART_STM32_USART_8_CLOCK_BUS ST_STM32_USART_40007C00_CLOCK_BUS #define CONFIG_I2C_1_BASE_ADDRESS ST_STM32_I2C_V2_40005400_BASE_ADDRESS #define CONFIG_I2C_1_EVENT_IRQ_PRI 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 5bfa4e0042c..b8c9b733372 100644 --- a/soc/arm/st_stm32/stm32l0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l0/dts_fixup.h @@ -63,18 +63,24 @@ #define CONFIG_UART_STM32_USART_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_1_NAME ST_STM32_USART_40013800_LABEL #define USART_1_IRQ ST_STM32_USART_40013800_IRQ_0 +#define CONFIG_UART_STM32_USART_1_CLOCK_BITS ST_STM32_USART_40013800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_1_CLOCK_BUS ST_STM32_USART_40013800_CLOCK_BUS #define CONFIG_UART_STM32_USART_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_2_NAME ST_STM32_USART_40004400_LABEL #define USART_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#define CONFIG_UART_STM32_USART_2_CLOCK_BITS ST_STM32_USART_40004400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_2_CLOCK_BUS ST_STM32_USART_40004400_CLOCK_BUS #define CONFIG_UART_STM32_LPUART_1_BASE_ADDRESS ST_STM32_LPUART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_LPUART_1_BAUD_RATE ST_STM32_LPUART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_LPUART_1_IRQ_PRI ST_STM32_LPUART_40004800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_LPUART_1_NAME ST_STM32_LPUART_40004800_LABEL #define LPUART_1_IRQ ST_STM32_LPUART_40004800_IRQ_0 +#define CONFIG_UART_STM32_LPUART_1_CLOCK_BITS ST_STM32_LPUART_40004800_CLOCK_BITS +#define CONFIG_UART_STM32_LPUART_1_CLOCK_BUS ST_STM32_LPUART_40004800_CLOCK_BUS #define CONFIG_I2C_1_BASE_ADDRESS ST_STM32_I2C_V2_40005400_BASE_ADDRESS #define CONFIG_I2C_1_COMBINED_IRQ_PRI ST_STM32_I2C_V2_40005400_IRQ_COMBINED_PRIORITY diff --git a/soc/arm/st_stm32/stm32l4/dts_fixup.h b/soc/arm/st_stm32/stm32l4/dts_fixup.h index 294ab6da77a..283223b7a25 100644 --- a/soc/arm/st_stm32/stm32l4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l4/dts_fixup.h @@ -88,36 +88,48 @@ #define CONFIG_UART_STM32_USART_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_1_NAME ST_STM32_USART_40013800_LABEL #define USART_1_IRQ ST_STM32_USART_40013800_IRQ_0 +#define CONFIG_UART_STM32_USART_1_CLOCK_BITS ST_STM32_USART_40013800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_1_CLOCK_BUS ST_STM32_USART_40013800_CLOCK_BUS #define CONFIG_UART_STM32_USART_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS #define CONFIG_UART_STM32_USART_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED #define CONFIG_UART_STM32_USART_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_2_NAME ST_STM32_USART_40004400_LABEL #define USART_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#define CONFIG_UART_STM32_USART_2_CLOCK_BITS ST_STM32_USART_40004400_CLOCK_BITS +#define CONFIG_UART_STM32_USART_2_CLOCK_BUS ST_STM32_USART_40004400_CLOCK_BUS #define CONFIG_UART_STM32_USART_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS #define CONFIG_UART_STM32_USART_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED #define CONFIG_UART_STM32_USART_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY #define CONFIG_UART_STM32_USART_3_NAME ST_STM32_USART_40004800_LABEL #define USART_3_IRQ ST_STM32_USART_40004800_IRQ_0 +#define CONFIG_UART_STM32_USART_3_CLOCK_BITS ST_STM32_USART_40004800_CLOCK_BITS +#define CONFIG_UART_STM32_USART_3_CLOCK_BUS ST_STM32_USART_40004800_CLOCK_BUS #define CONFIG_UART_STM32_UART_4_BASE_ADDRESS ST_STM32_UART_40004C00_BASE_ADDRESS #define CONFIG_UART_STM32_UART_4_BAUD_RATE ST_STM32_UART_40004C00_CURRENT_SPEED #define CONFIG_UART_STM32_UART_4_IRQ_PRI ST_STM32_UART_40004C00_IRQ_0_PRIORITY #define CONFIG_UART_STM32_UART_4_NAME ST_STM32_UART_40004C00_LABEL #define UART_4_IRQ ST_STM32_UART_40004C00_IRQ_0 +#define CONFIG_UART_STM32_UART_4_CLOCK_BITS ST_STM32_UART_40004C00_CLOCK_BITS +#define CONFIG_UART_STM32_UART_4_CLOCK_BUS ST_STM32_UART_40004C00_CLOCK_BUS #define CONFIG_UART_STM32_UART_5_BASE_ADDRESS ST_STM32_UART_40005000_BASE_ADDRESS #define CONFIG_UART_STM32_UART_5_BAUD_RATE ST_STM32_UART_40005000_CURRENT_SPEED #define CONFIG_UART_STM32_UART_5_IRQ_PRI ST_STM32_UART_40005000_IRQ_0_PRIORITY #define CONFIG_UART_STM32_UART_5_NAME ST_STM32_UART_40005000_LABEL #define UART_5_IRQ ST_STM32_UART_40005000_IRQ_0 +#define CONFIG_UART_STM32_UART_5_CLOCK_BITS ST_STM32_UART_40005000_CLOCK_BITS +#define CONFIG_UART_STM32_UART_5_CLOCK_BUS ST_STM32_UART_40005000_CLOCK_BUS #define CONFIG_UART_STM32_LPUART_1_BASE_ADDRESS ST_STM32_LPUART_40008000_BASE_ADDRESS #define CONFIG_UART_STM32_LPUART_1_BAUD_RATE ST_STM32_LPUART_40008000_CURRENT_SPEED #define CONFIG_UART_STM32_LPUART_1_IRQ_PRI ST_STM32_LPUART_40008000_IRQ_0_PRIORITY #define CONFIG_UART_STM32_LPUART_1_NAME ST_STM32_LPUART_40008000_LABEL #define LPUART_1_IRQ ST_STM32_LPUART_40008000_IRQ_0 +#define CONFIG_UART_STM32_LPUART_1_CLOCK_BITS ST_STM32_LPUART_40008000_CLOCK_BITS +#define CONFIG_UART_STM32_LPUART_1_CLOCK_BUS ST_STM32_LPUART_40008000_CLOCK_BUS #define CONFIG_I2C_1_BASE_ADDRESS ST_STM32_I2C_V2_40005400_BASE_ADDRESS #define CONFIG_I2C_1_EVENT_IRQ_PRI ST_STM32_I2C_V2_40005400_IRQ_EVENT_PRIORITY