diff --git a/arch/arm/soc/st_stm32/stm32f0/dts.fixup b/arch/arm/soc/st_stm32/stm32f0/dts.fixup index 4c9947d2b8fa..bd29840055f8 100644 --- a/arch/arm/soc/st_stm32/stm32f0/dts.fixup +++ b/arch/arm/soc/st_stm32/stm32f0/dts.fixup @@ -2,17 +2,17 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL -#define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 - -#define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL -#define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#define CONFIG_UART_STM32_USART_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS +#define CONFIG_UART_STM32_USART_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED +#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_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_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/arch/arm/soc/st_stm32/stm32f1/dts.fixup b/arch/arm/soc/st_stm32/stm32f1/dts.fixup index 08b4f8fe0628..c7c778fcc3b4 100644 --- a/arch/arm/soc/st_stm32/stm32f1/dts.fixup +++ b/arch/arm/soc/st_stm32/stm32f1/dts.fixup @@ -2,23 +2,23 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL -#define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 - -#define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL -#define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 - -#define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL -#define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0 +#define CONFIG_UART_STM32_USART_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS +#define CONFIG_UART_STM32_USART_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED +#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_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_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_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/arch/arm/soc/st_stm32/stm32f3/dts.fixup b/arch/arm/soc/st_stm32/stm32f3/dts.fixup index 06ca340ae831..7b0c77576159 100644 --- a/arch/arm/soc/st_stm32/stm32f3/dts.fixup +++ b/arch/arm/soc/st_stm32/stm32f3/dts.fixup @@ -2,17 +2,17 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL -#define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 +#define CONFIG_UART_STM32_USART_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS +#define CONFIG_UART_STM32_USART_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED +#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_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL -#define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#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_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/arch/arm/soc/st_stm32/stm32f4/dts.fixup b/arch/arm/soc/st_stm32/stm32f4/dts.fixup index ec97522d5ec1..a4577d217b94 100644 --- a/arch/arm/soc/st_stm32/stm32f4/dts.fixup +++ b/arch/arm/soc/st_stm32/stm32f4/dts.fixup @@ -2,29 +2,29 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40011000_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40011000_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40011000_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40011000_LABEL -#define PORT_1_IRQ ST_STM32_USART_40011000_IRQ_0 - -#define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL -#define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 - -#define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL -#define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0 - -#define CONFIG_UART_STM32_PORT_6_NAME ST_STM32_USART_40011400_LABEL -#define CONFIG_UART_STM32_PORT_6_BASE_ADDRESS ST_STM32_USART_40011400_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_6_BAUD_RATE ST_STM32_USART_40011400_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_6_IRQ_PRI ST_STM32_USART_40011400_IRQ_0_PRIORITY -#define PORT_6_IRQ ST_STM32_USART_40011400_IRQ_0 +#define CONFIG_UART_STM32_USART_1_BASE_ADDRESS ST_STM32_USART_40011000_BASE_ADDRESS +#define CONFIG_UART_STM32_USART_1_BAUD_RATE ST_STM32_USART_40011000_CURRENT_SPEED +#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_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_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_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_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/arch/arm/soc/st_stm32/stm32l0/dts.fixup b/arch/arm/soc/st_stm32/stm32l0/dts.fixup index b0a6f254d3b1..dc2a5a37aa1b 100644 --- a/arch/arm/soc/st_stm32/stm32l0/dts.fixup +++ b/arch/arm/soc/st_stm32/stm32l0/dts.fixup @@ -2,17 +2,17 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL -#define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 - -#define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL -#define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 +#define CONFIG_UART_STM32_USART_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS +#define CONFIG_UART_STM32_USART_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED +#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_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_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/arch/arm/soc/st_stm32/stm32l4/dts.fixup b/arch/arm/soc/st_stm32/stm32l4/dts.fixup index 1f2e63023844..c274769bdc97 100644 --- a/arch/arm/soc/st_stm32/stm32l4/dts.fixup +++ b/arch/arm/soc/st_stm32/stm32l4/dts.fixup @@ -2,35 +2,35 @@ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_1_IRQ_PRI ST_STM32_USART_40013800_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_1_NAME ST_STM32_USART_40013800_LABEL -#define PORT_1_IRQ ST_STM32_USART_40013800_IRQ_0 - -#define CONFIG_UART_STM32_PORT_2_BASE_ADDRESS ST_STM32_USART_40004400_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_2_BAUD_RATE ST_STM32_USART_40004400_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_2_IRQ_PRI ST_STM32_USART_40004400_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_2_NAME ST_STM32_USART_40004400_LABEL -#define PORT_2_IRQ ST_STM32_USART_40004400_IRQ_0 - -#define CONFIG_UART_STM32_PORT_3_BASE_ADDRESS ST_STM32_USART_40004800_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_3_BAUD_RATE ST_STM32_USART_40004800_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_3_IRQ_PRI ST_STM32_USART_40004800_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_3_NAME ST_STM32_USART_40004800_LABEL -#define PORT_3_IRQ ST_STM32_USART_40004800_IRQ_0 - -#define CONFIG_UART_STM32_PORT_4_BASE_ADDRESS ST_STM32_USART_40004C00_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_4_BAUD_RATE ST_STM32_USART_40004C00_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_4_IRQ_PRI ST_STM32_USART_40004C00_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_4_NAME ST_STM32_USART_40004C00_LABEL -#define PORT_4_IRQ ST_STM32_USART_40004C00_IRQ_0 - -#define CONFIG_UART_STM32_PORT_5_BASE_ADDRESS ST_STM32_USART_40005000_BASE_ADDRESS -#define CONFIG_UART_STM32_PORT_5_BAUD_RATE ST_STM32_USART_40005000_CURRENT_SPEED -#define CONFIG_UART_STM32_PORT_5_IRQ_PRI ST_STM32_USART_40005000_IRQ_0_PRIORITY -#define CONFIG_UART_STM32_PORT_5_NAME ST_STM32_USART_40005000_LABEL -#define PORT_5_IRQ ST_STM32_USART_40005000_IRQ_0 +#define CONFIG_UART_STM32_USART_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS +#define CONFIG_UART_STM32_USART_1_BAUD_RATE ST_STM32_USART_40013800_CURRENT_SPEED +#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_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_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_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_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_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/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c index 3315625548b9..2cece2bffd13 100644 --- a/drivers/serial/uart_stm32.c +++ b/drivers/serial/uart_stm32.c @@ -309,52 +309,52 @@ static int uart_stm32_init(struct device *dev) } /* Define clocks */ - #define STM32_CLOCK_UART(clock_bus, clock_enr) \ - .pclken = { .bus = clock_bus, \ - .enr = clock_enr } +#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(n) \ - static void uart_stm32_irq_config_func_##n(struct device *dev) -#define STM32_UART_IRQ_HANDLER_FUNC(n) \ - .irq_config_func = uart_stm32_irq_config_func_##n, -#define STM32_UART_IRQ_HANDLER(n) \ -static void uart_stm32_irq_config_func_##n(struct device *dev) \ +#define STM32_UART_IRQ_HANDLER_DECL(name) \ + static void uart_stm32_irq_config_func_##name(struct device *dev) +#define STM32_UART_IRQ_HANDLER_FUNC(name) \ + .irq_config_func = uart_stm32_irq_config_func_##name, +#define STM32_UART_IRQ_HANDLER(name) \ +static void uart_stm32_irq_config_func_##name(struct device *dev) \ { \ - IRQ_CONNECT(PORT_ ## n ## _IRQ, \ - CONFIG_UART_STM32_PORT_ ## n ## _IRQ_PRI, \ - uart_stm32_isr, DEVICE_GET(uart_stm32_ ## n), \ + IRQ_CONNECT(name##_IRQ, \ + CONFIG_UART_STM32_##name##_IRQ_PRI, \ + uart_stm32_isr, DEVICE_GET(uart_stm32_##name), \ 0); \ - irq_enable(PORT_ ## n ## _IRQ); \ + irq_enable(name##_IRQ); \ } #else -#define STM32_UART_IRQ_HANDLER_DECL(n) -#define STM32_UART_IRQ_HANDLER_FUNC(n) -#define STM32_UART_IRQ_HANDLER(n) +#define STM32_UART_IRQ_HANDLER_DECL(name) +#define STM32_UART_IRQ_HANDLER_FUNC(name) +#define STM32_UART_IRQ_HANDLER(name) #endif -#define UART_DEVICE_INIT_STM32(n, clock_bus, clock_enr) \ -STM32_UART_IRQ_HANDLER_DECL(n); \ +#define STM32_UART_INIT(name, clock_bus, clock_enr) \ +STM32_UART_IRQ_HANDLER_DECL(name); \ \ -static const struct uart_stm32_config uart_stm32_dev_cfg_##n = { \ +static const struct uart_stm32_config uart_stm32_cfg_##name = { \ .uconf = { \ - .base = (u8_t *)CONFIG_UART_STM32_PORT_ ## n ## _BASE_ADDRESS, \ - STM32_UART_IRQ_HANDLER_FUNC(n) \ + .base = (u8_t *)CONFIG_UART_STM32_##name##_BASE_ADDRESS,\ + STM32_UART_IRQ_HANDLER_FUNC(name) \ }, \ STM32_CLOCK_UART(clock_bus, clock_enr), \ - .baud_rate = CONFIG_UART_STM32_PORT_ ## n ## _BAUD_RATE \ + .baud_rate = CONFIG_UART_STM32_##name##_BAUD_RATE \ }; \ \ -static struct uart_stm32_data uart_stm32_dev_data_##n = { \ +static struct uart_stm32_data uart_stm32_data_##name = { \ }; \ \ -DEVICE_AND_API_INIT(uart_stm32_##n, CONFIG_UART_STM32_PORT_##n##_NAME, \ +DEVICE_AND_API_INIT(uart_stm32_##name, CONFIG_UART_STM32_##name##_NAME, \ &uart_stm32_init, \ - &uart_stm32_dev_data_##n, &uart_stm32_dev_cfg_##n, \ + &uart_stm32_data_##name, &uart_stm32_cfg_##name, \ PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ &uart_stm32_driver_api); \ \ -STM32_UART_IRQ_HANDLER(n) +STM32_UART_IRQ_HANDLER(name) /* * STM32F0 and STM32L0 series differ from other STM32 series by some @@ -364,95 +364,95 @@ STM32_UART_IRQ_HANDLER(n) #if defined(CONFIG_SOC_SERIES_STM32F0X) #ifdef CONFIG_UART_STM32_PORT_1 -UART_DEVICE_INIT_STM32(1, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART1) +STM32_UART_INIT(USART_1, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART1) #endif /* CONFIG_UART_STM32_PORT_1 */ #ifdef CONFIG_UART_STM32_PORT_2 -UART_DEVICE_INIT_STM32(2, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART2) +STM32_UART_INIT(USART_2, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART2) #endif /* CONFIG_UART_STM32_PORT_2 */ #ifdef CONFIG_UART_STM32_PORT_3 -UART_DEVICE_INIT_STM32(3, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART3) +STM32_UART_INIT(USART_3, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART3) #endif /* CONFIG_UART_STM32_PORT_3 */ #ifdef CONFIG_UART_STM32_PORT_4 -UART_DEVICE_INIT_STM32(4, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART4) +STM32_UART_INIT(USART_4, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART4) #endif /* CONFIG_UART_STM32_PORT_4 */ #ifdef CONFIG_UART_STM32_PORT_5 -UART_DEVICE_INIT_STM32(5, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART5) +STM32_UART_INIT(USART_5, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART5) #endif /* CONFIG_UART_STM32_PORT_5 */ #ifdef CONFIG_UART_STM32_PORT_6 -UART_DEVICE_INIT_STM32(6, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART6) +STM32_UART_INIT(USART_6, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART6) #endif /* CONFIG_UART_STM32_PORT_6 */ #ifdef CONFIG_UART_STM32_PORT_7 -UART_DEVICE_INIT_STM32(7, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART7) +STM32_UART_INIT(USART_7, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART7) #endif /* CONFIG_UART_STM32_PORT_7 */ #ifdef CONFIG_UART_STM32_PORT_8 -UART_DEVICE_INIT_STM32(8, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART8) +STM32_UART_INIT(USART_8, STM32_CLOCK_BUS_APB1_2, LL_APB1_GRP2_PERIPH_USART8) #endif /* CONFIG_UART_STM32_PORT_8 */ #elif defined(CONFIG_SOC_SERIES_STM32L0X) #ifdef CONFIG_UART_STM32_PORT_1 -UART_DEVICE_INIT_STM32(1, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_USART1) +STM32_UART_INIT(USART_1, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_USART1) #endif /* CONFIG_UART_STM32_PORT_1 */ #ifdef CONFIG_UART_STM32_PORT_2 -UART_DEVICE_INIT_STM32(2, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART2) +STM32_UART_INIT(USART_2, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART2) #endif /* CONFIG_UART_STM32_PORT_2 */ #ifdef CONFIG_UART_STM32_PORT_4 -UART_DEVICE_INIT_STM32(4, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART4) +STM32_UART_INIT(USART_4, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART4) #endif /* CONFIG_UART_STM32_PORT_4 */ #ifdef CONFIG_UART_STM32_PORT_5 -UART_DEVICE_INIT_STM32(5, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART5) +STM32_UART_INIT(USART_5, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART5) #endif /* CONFIG_UART_STM32_PORT_5 */ #else #ifdef CONFIG_UART_STM32_PORT_1 -UART_DEVICE_INIT_STM32(1, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_USART1) +STM32_UART_INIT(USART_1, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_USART1) #endif /* CONFIG_UART_STM32_PORT_1 */ #ifdef CONFIG_UART_STM32_PORT_2 -UART_DEVICE_INIT_STM32(2, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART2) +STM32_UART_INIT(USART_2, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART2) #endif /* CONFIG_UART_STM32_PORT_2 */ #ifdef CONFIG_UART_STM32_PORT_3 -UART_DEVICE_INIT_STM32(3, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART3) +STM32_UART_INIT(USART_3, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_USART3) #endif /* CONFIG_UART_STM32_PORT_3 */ #ifdef CONFIG_UART_STM32_PORT_4 -UART_DEVICE_INIT_STM32(4, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART4) +STM32_UART_INIT(UART_4, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART4) #endif /* CONFIG_UART_STM32_PORT_4 */ #ifdef CONFIG_UART_STM32_PORT_5 -UART_DEVICE_INIT_STM32(5, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART5) +STM32_UART_INIT(UART_5, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART5) #endif /* CONFIG_UART_STM32_PORT_5 */ #ifdef CONFIG_UART_STM32_PORT_6 -UART_DEVICE_INIT_STM32(6, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_USART6) +STM32_UART_INIT(USART_6, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_USART6) #endif /* CONFIG_UART_STM32_PORT_6 */ #ifdef CONFIG_UART_STM32_PORT_7 -UART_DEVICE_INIT_STM32(7, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART7) +STM32_UART_INIT(UART_7, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART7) #endif /* CONFIG_UART_STM32_PORT_7 */ #ifdef CONFIG_UART_STM32_PORT_8 -UART_DEVICE_INIT_STM32(8, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART8) +STM32_UART_INIT(UART_8, STM32_CLOCK_BUS_APB1, LL_APB1_GRP1_PERIPH_UART8) #endif /* CONFIG_UART_STM32_PORT_8 */ #ifdef CONFIG_UART_STM32_PORT_9 -UART_DEVICE_INIT_STM32(9, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_UART9) +STM32_UART_INIT(UART_9, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_UART9) #endif /* CONFIG_UART_STM32_PORT_9 */ #ifdef CONFIG_UART_STM32_PORT_10 -UART_DEVICE_INIT_STM32(10, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_UART10) +STM32_UART_INIT(UART_10, STM32_CLOCK_BUS_APB2, LL_APB2_GRP1_PERIPH_UART10) #endif /* CONFIG_UART_STM32_PORT_10 */ #endif